making a change in a branch
holy shit this new interface is bad
Merge pull request #1 from bpaluzzi/feature/test-feature-child-2

holy shit this new interface is bad
Merge branch 'feature/test-feature' into develop

Conflicts:
	README.md
Merge branch 'hotfix/1.0.1' into develop
adding in  a feature branch
Merge pull request #2 from bpaluzzi/feature/post-default-feature

Feature/post default feature
Merge branch 'release/1.1'