Update file2.txt
added from repo2
removed conflicts
Merge branch 'master' into repo2

Conflicts:
	file1.txt
Merge pull request #21 from kirantemp/repo2

Repo2 to master