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

merging
Fixed Character movement
added collision dectection
Merge pull request #3 from coreyor/master

added collision detection code
fast-forwarded branch to DGsDesigns branch
Added an enemy to the game
objectified enemy code
Merge branch 'master' of https://github.com/DGsDesigns/hack-plus into DGsDesigns-master
removed testing code
Merge pull request #2 from cinder1992/master

Pull 01