commit jbellon 1
Merge branch 'master' of https://github.com/arnaullop/gittest

Conflicts:
	1.txt