did more tests for Game, Zombie, Player and Obstacles classes.
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/JUnitTests/zombieProject/GameTester.java
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
Merge remote-tracking branch 'coady/master'