minor changes with collisions
Merge branch 'master' of github.com:WPI-RAIL/carl_moveit
Merge pull request #1 from WPI-RAIL/master

Merge