Minor changes
Merge branch 'master' of github.com:nslo/raytracer

Conflicts:
	raytracer/src/raytracer/raytracer.cpp