Fan-Wu Yang a3ccd75f4c Merge remote-tracking branch 'origin/sprint4_master' into Story877 ...

# Conflicts:
#	mock/src/main/java/seng302/DataInput/BoatXMLReader.java
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	mock/src/main/java/seng302/Model/Boat.java
#	mock/src/main/java/seng302/Model/CompoundMark.java
#	mock/src/main/java/seng302/Model/Leg.java
#	mock/src/main/java/seng302/Model/Mark.java
#	mock/src/main/java/seng302/Model/Marker.java
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Model/LegTest.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml

2017-05-24 22:57:31 +12:00

..

.idea

Removed breaking dependency and made it so app doesn't need the breaking dependency any more.

2017-05-22 11:49:40 +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 Story877

2017-05-24 22:57:31 +12:00

pom.xml

Removed breaking dependency and made it so app doesn't need the breaking dependency any more.

2017-05-22 11:49:40 +12:00