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

..

java/seng302

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

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

resources

Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.

2017-05-18 13:44:02 +12:00