Merge branch 'master' of https://github.com/ggerard2/MChocolat

Conflicts:
	index.php
fix?
Merge branch 'master' of https://github.com/ggerard2/MChocolat