Merge branch 'master' of https://github.com/cinder1992/hack-plus into cinder1992-master

merging
Fixed Character movement
added collision dectection
Merge branch 'master' of https://github.com/DGsDesigns/hack-plus into DGsDesigns-master

Conflicts:
	Entity/Player.pm
	Entity/data.pm
	img/room/tree.png