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

Conflicts:
	a.out
	rayTracer.cpp
intersections done