Merge origin/GUI into GUI

Conflicts:
	src/snakesandladders/javaFx/gameScene/GameSceneController.java
Merge origin/GUI into GUI

Conflicts:
	src/snakesandladders/javaFx/gameScene/GameSceneController.java