build path
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectWebApp/.classpath
Merge remote-tracking branch 'aschin/master', more merge errors

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/server/FakeDatabase.java
	ZombieProjectWebApp/src/zombieProject/server/UserServiceImpl.java