Merge origin/master

Conflicts:
	src/snakesandladders/consoleview/ConsoleView.java
	src/snakesandladders/gamecontrol/GameControl.java
	src/snakesandladders/gamemodel/GameModel.java
	src/snakesandladders/players/aPlayer.java
	src/snakesandladders/xml/XML.java
Merge origin/master

Conflicts:
	src/snakesandladders/consoleview/ConsoleView.java
	src/snakesandladders/gamecontrol/GameControl.java
	src/snakesandladders/gamemodel/GameModel.java
	src/snakesandladders/players/aPlayer.java
	src/snakesandladders/xml/XML.java
Merge origin/master

Conflicts:
	src/snakesandladders/gamecontrol/GameControl.java