Almost working...
Merge branch 'master' of https://github.com/barrymillham/RayTracer

Conflicts:
	Ray Generation/Ray Generation/main.cpp