Joseph Gardner 5d34b49316 Merge branch 'master' into submission ...

# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Model/RaceTest.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java

2017-05-15 16:08:46 +12:00

..

main

Merge branch 'master' into submission

2017-05-15 16:08:46 +12:00

test

Did some large tidy ups, refactoring, and documenting.

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