added branch1
added in branch 2
Merge branch 'master' into branch1

Conflicts:
	new.txt

commit merged new.txt