Avancement
Merge branch 'master' of github.com:Aluriak/TheCodingStones

Conflicts:
	ihm/ihm.py