things
Merge branch 'master' of https://github.com/justinkay/raytracer

Conflicts:
	rayTracer.cpp
color fix
Merge branch 'master' of https://github.com/justinkay/raytracer

Conflicts:
	rayTracer
	rayTracer.cpp
	rayTracer.o
	test2.png