commit user
Merge branch 'master' of https://github.com/SOUROURMEDDEBDIT/ESPRIT-Test

Conflicts:
	doc1.txt