added weapon class

Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
dshdgf
allow switching views
ignore generated files
made weapon class
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