fjc40 824a5ed3a2 Merge branch 'boat_boundarty_fix' into story36 ...

# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved.

2017-05-23 18:35:39 +12:00

..

main

Merge branch 'boat_boundarty_fix' into story36

2017-05-23 18:35:39 +12:00

test

Did some large tidy ups, refactoring, and documenting.

2017-05-08 03:29:33 +12:00