Et la lumière fut!

...sur le plafond
Merge branch 'master' of https://github.com/Haynner/OpenGL

Conflicts:
	myproj/main.cpp
	myproj/shaders/light.frag.glsl