sd
Merge branch 'master' of https://github.com/GuidoSchmidt/trinitytech

Conflicts:
	src/Renderer.cpp
Merge branch 'master' of https://github.com/GuidoSchmidt/trinitytech

Conflicts:
	assets/scenes/blend/sibenik-cathedral.blend
	assets/scenes/dae/sibenik-cathedral.dae
	src/Renderer.cpp
sdsdsd