1
Merge branch 'master' of https://github.com/LAEstudio/proj_1

Conflicts:
	image_randering/Light.cpp
	image_randering/main.cpp