add collision
Merge pull request #7 from guywithnose/master

add collision