commit sur branche1
Merge branch 'master' of https://github.com/constint/test

Conflicts:
	bla.txt