Modified file1 in the main develop branch.  Going to rebase this on top of my feature in a moment!
Adding a new file to the new feature
Merge pull request #2 from eccarmichael/feature/featureTwo

Feature/feature two