merged in the changes from the master branch so that latter mergers can run smoothly

#story[1087]

racevisionGame/src/main/java/visualiser/app/App.java

@@ -8,7 +8,6 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import seng302.gameController.InputChecker;
 
 public class App extends Application {
 

racevisionGame/src/main/java/visualiser/gameController/InputChecker.java

@@ -1,9 +1,9 @@
-package seng302.gameController;
+package visualiser.gameController;
 
 import javafx.animation.AnimationTimer;
 import javafx.scene.Scene;
-import seng302.gameController.Keys.ControlKey;
+import visualiser.gameController.Keys.ControlKey;
-import seng302.gameController.Keys.KeyFactory;
+import visualiser.gameController.Keys.KeyFactory;
 
 import java.util.HashMap;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java

@@ -1,4 +1,4 @@
-package seng302.gameController.Keys;
+package visualiser.gameController.Keys;
 
 import javafx.scene.input.KeyCode;
 

racevisionGame/src/test/java/visualiser/gameController/GameControllerManualTest.java

@@ -1,4 +1,4 @@
-package seng302;
+package visualiser.gameController;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -7,7 +7,7 @@ import javafx.scene.Scene;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import seng302.gameController.InputChecker;
+import visualiser.gameController.InputChecker;
 
 /**
  * Start to manually test the game controller