set fault
Merge branch 'master' of https://github.com/neubotech/RayTracing

Conflicts:
	example_02.cpp