I don't even know what I changed but I'm pretty sure it's cool
Merge branch 'master' of github.com:aminitani/raytracer