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

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

Conflicts:
	rayTracer
	rayTracer.o
trying to test what we have