something
Merge branch 'master' of git://github.com/slipson/ZombieProject
testing
I added meaningful methods to the Map class
wooooo we can all push now
I added a string to test keypress of player
Merge branch 'master' of git://github.com/slipson/ZombieProject
Merge branch 'master' of git://github.com/slipson/ZombieProject

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
I made some small changes to Player and Map but created enemy and player
initialization and collision testing between zombies and player
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