added commit 2
test1 modified
modified test1
Merge branch 'master' into branch2

Conflicts:
	test.txt
Merge branch 'branch2' into branch4

Conflicts:
	test.txt