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