hot fixes to merge still
Merge branch 'master' of https://github.com/miketamis/towngame

Conflicts:
	src/main/java/com/TownGame/towngame/Game.java
	src/main/java/com/TownGame/towngame/Player.java
	src/main/java/com/TownGame/towngame/basicZombie.java