blah
Merge branch 'master' of https://github.com/Ceraunograph/RayTracer
updated camera