From 09eaf6d9684fcf20d3d4a33def4e2ac180b6b10f Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Thu, 17 Aug 2017 13:55:49 +1200
Subject: [PATCH] Merged master.

---
 racevisionGame/src/main/java/mock/app/MockOutput.java | 2 --
 racevisionGame/src/main/java/visualiser/app/App.java  | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/MockOutput.java b/racevisionGame/src/main/java/mock/app/MockOutput.java
index 406d1c1c..63ff1dd1 100644
--- a/racevisionGame/src/main/java/mock/app/MockOutput.java
+++ b/racevisionGame/src/main/java/mock/app/MockOutput.java
@@ -15,8 +15,6 @@ import java.util.logging.Logger;
  */
 public class MockOutput implements RunnableWithFramePeriod {
 
-
-
     /**
      * A queue to send messages to client.
      */
diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index 40e1e2f2..420ae10d 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -45,6 +45,11 @@ public class App extends Application {
         loadStart(App.stage);
     }
 
+    /**
+     * Initiation
+     * @param stage
+     * @throws IOException
+     */
     public void loadStart(Stage stage) throws IOException {
         FXMLLoader loader = new FXMLLoader(App.class.getResource("/visualiser/scenes/main.fxml"));
         Parent root = loader.load();