Added collision detection.
(not yet complete)
Merge branch 'master' of https://github.com/Malow/NotDeadYet