fjc40
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
This commit (7990ac9d2e) was the commit from master that story49 was merged into.
Everything appears to be working.
# Conflicts:
# mock/src/main/java/seng302/App.java
# mock/src/main/java/seng302/Constants.java
# mock/src/main/java/seng302/DataInput/RaceXMLReader.java
# mock/src/main/java/seng302/DataInput/RegattaXMLReader.java
# mock/src/main/java/seng302/Model/Boat.java
# mock/src/main/java/seng302/Model/Event.java
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Data/BoatDataTest.java
# mock/src/test/java/seng302/Data/RaceDataTest.java
# mock/src/test/java/seng302/Model/BoatTest.java
# mock/src/test/java/seng302/Model/RaceXMLTest.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/RaceXMLReader.java
Manually resolved conflicts. :(