Fetaure 1
Merge pull request #3 from rajeshhs/Feature-1

Fetaure 1
conflict
Merge branch 'develop' of local repository into Feature-2