Merge remote-tracking branch 'sbonner1/master'
Merge remote-tracking branch 'slipson/master'
made JUnit test for Weapon class.
stuff.......
changes to game class.
Merge remote-tracking branch 'slipson/master'
lkjgh
trying to merge with josh
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'slipson/master'

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

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Map.java
Merge branch 'master' of git@github.com:coady/ZombieProject.git
Merge remote-tracking branch 'coady/master'

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