changes
Merge branch 'master' of https://github.com/LUKK3/gamebase.git

Conflicts:
	src/Renderer.h