stuff
Merge branch 'Andre' of https://github.com/ScientX/P3SJ_RayTracer
Merge branch 'Andre'
Merge branch 'master' of https://github.com/ScientX/P3SJ_RayTracer