Added collision detection data and skeleton.  To DO; Write bounding boxes, do mesh to mesh collision check, add rigid body physics
VS merging
VS merging
Collision files
merge conflicts