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

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

Conflicts:
	index.php