sphere, triangle intersections
Merge branch 'dev'

Conflicts:
	src/raytracer/scene.cpp
	src/raytracer/shape.h