bla
Merge branch 'master' of https://github.com/devBrouwer/patterned-game-engine

Conflicts:
	Behaviours/KeysBehaviour.cpp
	GameFactory.cpp