Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectWebApp/.classpath
walls and stuff
Walls and correct health pack spawning and correct zombie movement
bullet thingy.
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
changing spawns
Merge remote-tracking branch 'sbonner1/master'
collision
I need to merge with aschin
Merge remote-tracking branch 'slipson/master', bullet
pre-merge with adam
Merge remote-tracking branch 'aschin/master', bullet implementation

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
Merge remote-tracking branch 'aschin/master'
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java