Merge pull request #4 from kirantemp/master

from master
Merge branch 'master' into repo2
added from repo2
added from repo2
modified from repo2.1
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
sync up with master
Merge branch 'master' into repo2

Conflicts:
	file1.txt