test
Manually merged Zombie
Merge branch 'master' of
https://github.com:443/jloloew/angraves-zombie-game.git

Conflicts:
	angraves-zombie-game/src/Zombie.java