added a few lines to gameview and game
working zombie roam test
trying to merge with josh
auto move. Needs the square root function added. Tests will come soon
the commit before merging with shane
Merge remote-tracking branch 'sbonner1/master'

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

Conflicts:
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
zMove test
commit
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/JUnitTests/zombieProject/ZombieTest.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
i hate this
Merge remote-tracking branch 'sbonner1/master'
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
removed header stuff
I got the keypresses working, player is now controllable via
keyhandlers in the Gameview class
commit of comments and minor changes to gameview
comminting all of my changes