fixed merge errors
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
need to commit to pull/merge
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
did more tests for Game, Zombie, Player and Obstacles classes.
Merge remote-tracking branch 'coady/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java