no message
Merge branch 'master' of https://github.com/thibautha/ProjetPHP

Conflicts:
	config/config.ini