Merge remote-tracking branch 'slipson/master'

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