added collision detector
Merge branch 'master' of github.com:dwwkelly/robot