LOL
Merge branch 'master' of https://github.com/newincpp/kaboom
Lol
Merge branch 'master' of https://github.com/newincpp/kaboom

Conflicts:
	Map.cpp
	Player.cpp