commit3
Merge branch 'master' into branch1

Conflicts:
	file1.txt
Merge pull request #1 from matthis-perrin/branch1

Branch1