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

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

2017-03-20 17:12:06 +13:00

..

main

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

2017-03-20 17:12:06 +13:00

test/java/seng302

Switched latitude/longitude around

2017-03-20 16:40:32 +13:00