sphere test
Merge branch 'master' of https://github.com/Mduchamp/CS-184

Conflicts:
	Ray.h
	Ray.h.gch
	Scene
	Scene.cpp
	Scene.o
	Shape.h
	Shape.h.gch
gsi bump
Merge branch 'master' of https://github.com/Mduchamp/CS-184

Conflicts:
	Ray.h
	Scene.cpp
	Shape.h