collision works, hooray
Merge pull request #2 from ansballard/master

collision works, hooray