updated game class
Merge remote-tracking branch 'sbonner1/master'
stuff43
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'
canMove class changes(incomplete)
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
Sync'd with Adam FINALLY
modified Player's collision method
added a health bar
stuff
Merge remote-tracking branch 'sbonner1/master'
completed zombie collision methods

Merge remote-tracking branch 'aschin/master'

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

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
Arrow key input is now ASWD key input instead
Game over screen implemented and play again ability