finished very long path trace
Merge branch 'master' of github.com:programmerjake/path-trace

Conflicts:
	bin/Release/path-trace
	obj/Release/src/color.o
	obj/Release/src/difference.o
	obj/Release/src/intersection.o
	obj/Release/src/material.o
	obj/Release/src/object.o
	obj/Release/src/path-trace.o
	obj/Release/src/plane.o
	obj/Release/src/span.o
	obj/Release/src/sphere.o
	obj/Release/src/test.o
	obj/Release/src/transform.o
	obj/Release/src/union.o
	obj/Release/src/vector3d.o
	path-trace.layout