fjc40 06d786d581 Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules ...

# Conflicts:
#	mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
#             Selected copy from splitIntoTwoModules.

2017-04-27 20:02:18 +12:00

..

main

Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules

2017-04-27 20:02:18 +12:00

test

Renamed some directories, optimized imports, general code clean up

2017-04-25 17:41:10 +12:00