making a change in a branch
Merge branch 'feature/test-feature' into develop

Conflicts:
	README.md
no message
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