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

Conflicts:
	a.out