Adding a file for testing a feature branch.
Merge branch 'hotfix/simple-hotfix' into develop
Merge branch 'feature/simple-test' into develop
Merge pull request #1 from jefffarkas/develop

Develop