Added zombie movement and suppressed warnings
ignore generated files
allow switching views
ignore generated files
Merge remote-tracking branch 'slipson/master'

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

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

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
Merge remote-tracking branch 'sbonner1/master'
final changes before the storm
before the storm
Merge remote-tracking branch 'slipson/master'
made JUnit test for Weapon class.