Merge branch 'release/1.0'
Merge branch 'develop' of https://github.com/dwelch91/test_git_flow into develop
Adding new stuff
Updating feature 2
Ugly merge commit message :S

Merge branch 'feature/carlos' into develop