main
i
merge
:q
:z;
:q
Merge branch 'master' of https://github.com/dalin2/RayTracer
merge
It's not working