playerTest
I made some small changes to Player and Map but created enemy and player
initialization and collision testing between zombies and player
player testclass
Merge remote-tracking branch 'aschin/master'
added collision (canMove) and a move (move) methods to the player class.
also added some notes to the code.
test.
I fixed a bracket issue in the player class
l;dasfjka;dfljk
askd;jf
Merge github.com:slipson/ZombieProject

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
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
finally loaded everyone's stuff