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

Conflicts:
	a.txt
Merge pull request #11 from bikashchoudhary/master

Commit 1