added from repo2
Merge branch 'repo2' of https://github.com/kirantemp/myrepo into repo2

Conflicts:
	file1.txt
added line from repo2