Format
Merge branch 'master' of https://github.com/miketamis/towngame

Conflicts:
	src/main/java/com/TownGame/towngame/Enemy.java
	src/main/java/com/TownGame/towngame/Game.java
Merge branch 'master' of https://github.com/miketamis/towngame