Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/java/seng302/controllers/CanvasController.java
	src/main/java/seng302/models/Boat.java

src/main/java/seng302/models/Boat.java

@@ -99,6 +99,10 @@ public class Boat {
         return color;
     }
 
+    public double getSpeedInKnots(){
+        return Math.round((this.velocity * 1.94384) * 100d) / 100d;
+    }
+
     public void setMarkLastPast(int markLastPast) {
         this.markLastPast = markLastPast;
     }

src/main/java/seng302/models/Race.java

@@ -16,7 +16,7 @@ public class Race {
     private long startTime = 0;
     private double timeScale = 1;
     private boolean raceFinished = false; // Race is finished
-    private int raceTime = -10; // Current time in the race
+    private int raceTime = -2; // Current time in the race
 
     /**
      * Race class containing the boats and legs in the race