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
comminting all of my changes
This is a working system. Player is movable with keypresses
Merge remote-tracking branch 'aschin/master'

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