Changes to model.

I combined the black & white URDF files & fixed some of the collision properties of the base_link.