i hate this
updated game class
Merge remote-tracking branch 'sbonner1/master'
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
stuff43
Merge remote-tracking branch 'slipson/master'
Merge remote-tracking branch 'slipson/master'

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

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
canMove class changes(incomplete)
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
k
added setter methods for getting zombie image dimensions
modifying game class
added methods to game class to get x/y coordinates for bullets direction
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
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