the commit before merging with shane
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Merge remote-tracking branch 'sbonner1/master'
This is working and we can now include Game stuff in Gameview! :D
Merge remote-tracking branch 'slipson/master'

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