commit 3
commit 5
resolve conflict
update newtest.txt 5
Merge pull request #7 from bikashchoudhary/master

Test commit 5