fixed lost data
added ammunition
increased ammo functionality with shane. other small changes
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java