updateGraphics
Merge branch 'master' of https://github.com/fdelaney/TP1-Java.git

Conflicts:
	src/ca/csf/Travail_Pratique_1/Game.fxml
	src/ca/csf/Travail_Pratique_1/GameController.java