Added basic collision detection
Merge branch 'master' of https://github.com/jtmac6/gdd2game into ry60003333
Merge pull request #2 from jtmac6/ry60003333

Screw it!