Merge pull request #1 from cinder1992/master

Merger
Merge pull request #2 from DGsDesigns/master

Merge pull request #1 from cinder1992/master
Merge pull request #1 from coreyor/master

Merge pull request #1 from cinder1992/master
added collision detection code
Merge pull request #3 from coreyor/master

added collision detection code
fast-forwarded branch to DGsDesigns branch
Merge branch 'master' of https://github.com/DGsDesigns/hack-plus into DGsDesigns-master
removed testing code
removed object oriented code
Merge branch 'master' of https://github.com/DGsDesigns/hack-plus into DGsDesigns-master
Merged commits
Cleaned up code