made some changes in file2
Merge branch 'master' into Branch1

Conflicts:
	myfile2.txt