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

Conflicts:
	element/perso/ennemi/ennemi.py