Merge origin/master

Conflicts:
	src/snakesandladders/players/Soldier.java
	src/snakesandladders/players/aPlayer.java