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

Conflicts:
	qt/build-checkers-Desktop_Qt_5_2_1_MinGW_32bit-Debug/coup.txt