Added geometric primitive classes
merging changes
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
pulling files
mergin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
added Sampler class
mergin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer