something
Merge branch 'master' of git://github.com/slipson/ZombieProject
testing
Merge branch 'master' of git://github.com/slipson/ZombieProject

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java
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.
l;dasfjka;dfljk
askd;jf
Merge github.com:slipson/ZombieProject

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/Player.java