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

# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml

2017-03-20 15:34:12 +13:00

..

main

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

2017-03-20 15:34:12 +13:00

test/java/seng302

Added two test boats to race

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