playerTest
player testclass
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
fix line ending?
Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/.classpath
	ZombieProjectModelClasses/src/zombieProject/Game.java
	ZombieProjectModelClasses/src/zombieProject/Player.java
zombieTest
again
Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
comment
finally loaded everyone's stuff
initial checkin of GWT project
added .gitignore
Merge remote-tracking branch 'aschin/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
Merge remote-tracking branch 'sbonner1/master'
Merge remote-tracking branch 'sbonner1/master'

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

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Map.java
removed x and y parameters from Player's canMove() method. Since this
method is already in the player class, we can just use this.x and
this.y.
changed Player's canMove() method from private to public method. Also,
changed canMove() method so it might actually work. Added a JUnit test
for the method in PlayerTest().
changed doubles to ints. Also added javadoc comments to all methods in
Player and Zombie classes.
Adding the view