Merged with Doug's code
Merge branch 'master' of https://github.com/bjrafeld/RayTracer