Merge remote-tracking branch 'slipson/master'
stuff
change zombie method
fetched spawned class
fixed bugs
got my WebApp project folder up to date w/ adam's repository
Merge remote-tracking branch 'aschin/master'
Merge remote-tracking branch 'slipson/master'
created obstacle class
made changes to obstacle constructor
Merge remote-tracking branch 'slipson/master'
changed obstacle constructor again
created JUnit test for Obstacle class
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Game.java
	ZombieProjectModelClasses/src/zombieProject/shared/Zombie.java
	ZombieProjectWebApp/.classpath
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
finished JUnit test for Obstacle class
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectWebApp/src/zombieProject/client/GameView.java
stuff
pre-merge with adam
Merge remote-tracking branch 'aschin/master', bullet implementation

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