Moving getCollisionShape function to parent class
Merge branch 'hillyTerrain' of https://github.com/NASA-Tensegrity-Robotics-Toolkit/NTRTsim into hillyTerrain