message d'explication
Merge branch 'master' of https://github.com/lachandv/chaton_garou

Conflicts:
	site/index.php