Lol
Merge branch 'master' of https://github.com/lamogui/POO

Conflicts:
	src/window.cpp