modif locale
Merge branch 'master' of https://github.com/samuelfr/ESGI_demo

Conflicts:
	test.txt