???
Merge branch 'master' of https://github.com/romaincarlsen/EtudesPratiques

Conflicts:
	qt/checkers/Game.h