Scene description
Merge branch 'master' of https://github.com/JulietteL/INF355

Conflicts:
	Projet/src/Ray.hs
	Projet/src/RayTracer.hs
	Projet/src/Scene.hs