fuck
Merge branch 'master' of github.com:newincpp/kaboom

Conflicts:
	Scene.cpp
	main.cpp
render desactivation added