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

merging
Fixed Character movement
added collision dectection
fast-forwarded branch to DGsDesigns branch