Merge branch 'feature'
Another feature
Merge pull request #2 from IanWhitney/feature2

Feature2