fjc40 1bd9fdd931 Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2 ...

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

Also reverted the change to the prestart and preparatory time, as they had gotten flipped around (prestart is > 3min to start, preparatory is < 1 min to start).

2017-05-25 14:04:06 +12:00

..

doc

Actually added sub modules this time

2017-04-20 11:16:19 +12:00

src

Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2

2017-05-25 14:04:06 +12:00

pom.xml

mock pom had the name visualiser 🤔

2017-05-15 11:42:42 +12:00