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

Conflicts:
	ZombieProjectWebApp/.classpath
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
fixed lost data
added ammunition
increased ammo functionality with shane. other small changes
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.
Removed useless code
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
spawn obstacles. zombies can't move through obstacles.
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/JUnitTests/zombieProject/PlayerTest.java
	ZombieProjectModelClasses/JUnitTests/zombieProject/ZombieTest.java
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/IDatabase.java
	ZombieProjectModelClasses/src/zombieProject/shared/Player.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/client/LoginView.java
	ZombieProjectWebApp/src/zombieProject/server/FakeDatabase.java
	ZombieProjectWebApp/src/zombieProject/server/UserServiceImpl.java