test6 added
Merge pull request #6 from ashishsharma3/branch1

test6 added
Merge branch 'feature1'
conflict resolved