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

#story[1087]
2017-07-24 12:05:00 +12:00
parent 738a765a0a
commit 1ebbb8d4c7
12 changed files with 14 additions and 15 deletions
@@ -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 {