demo
Merge branch 'master' of https://github.com/GabriellaQiong/Project1-RayTracer
demo