Cleaned up collision method.
Merge branch 'sam' of github.com:stich/HeartAttack into sam