minor changes
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/JUnitTests/zombieProject/ZombieTest.java
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Merge remote-tracking branch 'slipson/master'
Player movement and Zombie AI are functional
Fixed an error
Merge remote-tracking branch 'slipson/master'

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

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Merge remote-tracking branch 'slipson/master'

and has improved movement. Test to come later
background image added to UI
Merge remote-tracking branch 'aschin/master'
Merge remote-tracking branch 'slipson/master'
after pull from Adam 4/8/13
player moves better
fix classpath/package names
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
	ZombieProjectWebApp/src/zombieProject/client/ZombieProjectWebApp.java
array of zombies
Merge remote-tracking branch 'aschin/master'
Merge remote-tracking branch 'aschin/master', minor changes

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Creates 1 zombie per second
Merge remote-tracking branch 'aschin/master'