LOl
LolMerge branch 'master' of https://github.com/newincpp/kaboom

Conflicts:
	Player.cpp