Version before merge
Merge branch 'master' of https://github.com/Bazard/HeroKart

Conflicts:
	src/Game.cpp
Version pour Baptiste