First stab at collision detection
Merge branch 'master' of github.com:jvaill/bummerguy