Added the Sphere.cpp
Added Cube and Sphere cpp
Fixed conflict
Merge branch 'master' of github.com:emmaforsling/Monte-Carlo