some shit
Merge branch 'master' of https://github.com/justinkay/raytracer
some more shit
no triangle shit