Jessica Syder
669a303e9b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml