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

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

Conflicts:
	Raytracer/rt/coordmappers/cylindrical.cpp