all kinds of messed up
re-doing mouseEvent
Merge branch 'master' of git@github.com:sbonner1/ZombieProject.git

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/Player.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
merged and fixed all conflicts

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/Player.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
bullet thingy.
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
Merge remote-tracking branch 'sbonner1/master'
collision