dummy
Merge remote-tracking branch 'origin/master'

Conflicts:
	CG1raytracer.v12.suo
	CG1raytracer.vcxproj.filters