rok
Merge branch 'HEAD' of https://github.com/LUKK3/gamebase.git

Conflicts:
	src/Renderer.cpp
	src/Renderer.h
	src/main.cpp