David Wu 1842b8f0b2 Merge remote-tracking branch 'origin/story9' into story9 ...

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

2017-03-20 16:22:12 +13:00

..

main

Merge remote-tracking branch 'origin/story9' into story9

2017-03-20 16:22:12 +13:00

test/java/seng302

Added two test boats to race

2017-03-19 23:05:18 +13:00