Merge pull request #1 from jasonhowes/master

Sync up develop with master.
Add first feature
Merge pull request #2 from jasonhowes/feature/1-first-feature

Add first feature
Add second feature
Merge pull request #3 from jasonhowes/feature/2-second-feature

Add second feature
Add third feature
Add third feature
Merge branch 'feature/3-third-feature' of github.com:jasonhowes/git-flow-sandbox into feature/3-third-feature
Merge pull request #4 from jasonhowes/feature/3-third-feature

Add third feature
Add fourth feature
Merge pull request #5 from jasonhowes/feature/4-fourth-feature

Add fourth feature
Merge branch 'develop'