Merci pierre

Signed-off-by: Anis Benyoub <anbenh@l4712-22.info.polymtl.ca>
Merge branch 'master' of https://github.com/AnisB/CS_RayTracer

Conflicts:
	data/shader/raytrace/intersect.glsl