CSG
Merge branch 'master' of https://github.com/atanas1054/ray_tracer

Conflicts:
	CG1-skeleton/CG1raytracer.suo
	CG1-skeleton/Release/CG1raytracer.exe
	CG1-skeleton/Release/CG1raytracer.log
	CG1-skeleton/Release/CG1raytracer.pdb
	CG1-skeleton/Release/CL.read.1.tlog
	CG1-skeleton/Release/CL.write.1.tlog
	CG1-skeleton/Release/a_instancing.obj
	CG1-skeleton/Release/cl.command.1.tlog
	CG1-skeleton/Release/instance.obj
	CG1-skeleton/Release/link.read.1.tlog
	CG1-skeleton/Release/link.write.1.tlog
	CG1-skeleton/Release/vc100.pdb
	CG1-skeleton/ipch/cg1raytracer-e3657f6e/cg1raytracer-9e88852e.ipch