Merge branch 'develop' into Story40_Zooming

# Conflicts:
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/GameClient.java

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -245,15 +245,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
         });
         // Adds the new data series to the sparkline (and set the colour of the series)
-        Platform.runLater(() -> {
+        Platform.runLater(() ->
             sparkLineData
                 .stream()
                 .filter(spark -> !raceSparkLine.getData().contains(spark))
                 .forEach(spark -> {
                     raceSparkLine.getData().add(spark);
                     spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
-                });
-        });
+                })
+        );
     }
 
     private void initialiseSparkLine() {
@@ -315,7 +315,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 updateRaceTime();
                 updateWindDirection();
                 updateOrder();
-                updateSparkLine();
+//                updateSparkLine();
             }
         }, 0, 1000);
     }