Merge branch 'hotfix-0.1.1'
starting with feature 2
still working on feature 2
finished feature 2
bumped version to 0.1.2
fixed production bug
Merge branch 'hotfix-0.1.2' into develop
Merge branch 'feature2' into develop