Merge branch 'master' of https://github.com/bikashchoudhary/TestRepository1
Merge pull request #10 from bikashchoudhary/master

pull 9
Commit 2
Merge branch 'master' of https://github.com/choudharybikash/TestRepository1
commit 4
Commit 1
commit 3
resolving conflicts
Merge branch 'master' of https://github.com/bikashchoudhary/TestRepository1
test comments

Conflicts:
	a.txt