Merge pull request #6 from kirantemp/repo2.1

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

Conflicts:
	file1.txt
added line from repo2
added from master
sync up with master
Merge branch 'master' into repo2

Conflicts:
	file1.txt
added in master
added in repo2
added from repo2
Merge branch 'repo2'
added from master
Merge pull request #7 from kirantemp/master

master to repo2
Merge pull request #9 from kirantemp/repo2

Repo2 to 2..1