Merge remote-tracking branch 'aschin/master'
FakeDatabase is filled and login screen works
Merge remote-tracking branch 'aschin/master'
try to get Adam's latest changes
Pulled from Adam, functional firing
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/IDatabase.java
	ZombieProjectModelClasses/src/zombieProject/shared/Player.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/EndGameView.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/server/FakeDatabase.java
	ZombieProjectWebApp/src/zombieProject/server/UserServiceImpl.java