updateing collision
fixing merge
Merge branch 'Shawn' of https://github.com/yallups/RuberSystem into Shawn

Conflicts:
	ManyCube/Shape3D.hpp
	ManyCube/ruberSystem.cpp