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;
     }