some changes
Merge ffs

Merge branch 'master' of https://github.com/arychagov/raytracer