merge conflict
Merge branch 'master' of https://github.com/toadums/RayTracer

Conflicts:
	Funky/Funky/RayTracer.cs