Intersection quadriques
Merge branch 'master' of https://github.com/AnisB/CS_RayTracer

Conflicts:
	data/scenes/scene_test_quad.dat
Intersection quadriques correction
Merge branch 'master' of https://github.com/AnisB/CS_RayTracer