Oops forgot this
Merge branch 'master' of github.com:nslo/raytracer