New commit
Merge branch 'master' into branch2

Conflicts:
	test1.txt