Some Emacs local dir variables (you can ignore this).
Removed warnings.
Make scene start with a light and a torus.
Merge branch 'master' into soft-shadows

Conflicts:
	.dir-locals.el
	SceneGraph/scene.cpp
Added shadow on toon shader with deferred shading