mon commit local
commit ok apres reset
commit new file
Merge branch 'master' of https://github.com/chouquettor/mms.git

Conflicts:
	m3s/src/main/webapp/test.txt