Merge pull request #8 from kirantemp/repo2

Merge pull request #7 from kirantemp/master
Merge pull request #16 from kirantemp/repo2

Repo2 to master
from master
Merge branch 'master' of https://github.com/kirantemp/myrepo

Conflicts:
	file1.txt
added file1.txt
`
removed conflicts
Merge branch 'master' into repo2

Conflicts:
	file1.txt