fine toning
Merge remote-tracking branch 'aschin/master'
merged with adam
Merge remote-tracking branch 'sbonner1/master'

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