Merge
Merge branch 'master' of github.com:YanyanZ/RayTracer2
Merge branch 'master' of github.com:YanyanZ/RayTracer2
Merge branch 'master' of github.com:YanyanZ/RayTracer2
Add: beginning of parsing. Scene parameters for now, objects to come
Merge branch 'master' of github.com:YanyanZ/RayTracer2