new branch
Merge branch 'master' into branch1

Conflicts:
	test.txt
Merge branch 'branch1'