.
Merge branch 'master' of https://github.com/Spide90/Raytracer.git

Conflicts:
	Raytracer/rt/coordmappers/tmapper.cpp
	Raytracer/rt/solids/triangle.cpp
Merge branch 'master' of https://github.com/Spide90/Raytracer.git
.