syncing to get latest

Test
Merge branch 'master' of https://github.com/dcruwys/ZombieSimulator2001

Conflicts:
	bin/edu/du/cs/Building.class
	bin/edu/du/cs/Cop.class
	bin/edu/du/cs/GraphicsEngine.class
	bin/edu/du/cs/Human.class
	bin/edu/du/cs/Medic.class