commit
Merge branch 'master' of https://github.com/ClementRoy/Gite-des-cimes

Conflicts:
	modules/enfants/infos.php