Resolving Conflict
Resolving conflict
Merge branch 'master' of https://github.com/bikashchoudhary/TestRepository1
commit 7
Merge pull request #13 from bikashchoudhary/master

commit 7