Basic collision detection
Merge pull request #8 from Epiphane/elliot

Basic collision detection