added weapon class

Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
dshdgf
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
made weapon class
Merge remote-tracking branch 'coady/master'
stuff
Merge remote-tracking branch 'coady/master'
Merge remote-tracking branch 'sbonner1/master'
some view changes
rename package with model classes so UI can use it

change classpath of UI project to use model classes project.