This is an ambiguous commit
Player movement and Zombie AI are functional
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Merge remote-tracking branch 'slipson/master'

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