Feature-2
conflict
Merge branch 'develop' of local repository into Feature-2
Conflicts resolved
Merge pull request #5 from rajeshhs/Feature-2

Feature-2