Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/seng302/Model/Boat.java

src/main/java/seng302/Model/Boat.java

@@ -21,7 +21,7 @@ public class Boat {
      */
     public Boat(String name, double velocity, String abbrev) {
         this.velocity = velocity;
-        this.velocityProp = new SimpleStringProperty(String.valueOf(velocity));
+        this.velocityProp = new SimpleStringProperty(String.valueOf(Math.round(velocity)));
         this.abbrev = abbrev;
         this.name = new SimpleStringProperty(name);
     }