My stuff that hopefully syncs
Merge branch 'master' of https://github.com/ensign-redshirt/Zombie

Conflicts:
	enemyClass.java

Trying to force github to get our branches into line