adding featureFile1 to feature branch
resolved conflict on devFile1
adding featureFile2 to feature branch
Merge pull request #1 from firoze/feature

Feature 1 approved! merge time!