Merge pull request #1 from jasonhowes/feature/2-second-feature

Add second feature
Merge pull request #2 from jasonhowes/master

Release v1.0.
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/jasonhowes/git-flow-sandbox into develop
Merge branch 'develop'