Added feature 4
Updated via remote repo
Adding a hidden feature
Updated README with git workflow
Updated README
Adding README to enable merge from develop
Commiting to resolve merge conflict
Merge branch 'develop'