reinit
Merge branch 'master' of github.com:ngordon17/DukeRayTracer
reinit