hba56
fd120edaf9
Merge remote-tracking branch 'remotes/origin/master' into story77
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
# settings/keyBindings.xml