commit 5
reglage
Merge branch 'master' of http://github.com/KacemRostom/pourCloner

Conflicts:
	test.txt