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

Conflicts:
	raytracer/src/raytracer/main.cpp

Made ray tracing the default mode in application