minor cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	zomblieFortress/Assets/Zombie.cs