array of zombies
Merge remote-tracking branch 'aschin/master', minor changes

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java