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

Conflicts:
	test.txt