Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop

# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/Controller.java

src/main/java/seng302/controllers/CanvasController.java

@@ -135,7 +135,7 @@ public class CanvasController {
             }
         };
         for (Mark m : raceViewController.getRace().getCourse()) {
-            System.out.println(m.getName());
+            //System.out.println(m.getName());
         }
         //timer.start();
     }