iug
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Systems/RenderSystem.cpp
Renderer doneere
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn