Change by tupac
Merge branch 'master' of https://github.com/dcruwys/ZombieSimulator2001

Conflicts:
	src/edu/du/cs/Human.java