c
Merge branch 'master' of https://github.com/jpeyraud/LanceDeRayons.git

Conflicts:
	src/Brdf.cpp
	src/Scene.cpp
	src/main.cpp