cause
Merge remote-tracking branch 'origin/master'

Conflicts:
	merci.php
Merge branch 'master' of https://github.com/Laowphis/nuit-de-l-info