Merge branch 'release-1.0' into develop
starting with feature 4
Merge branch 'master' of github.com:michelgrootjans/git_workshop into develop
Merge branch 'hotfix-1.0.1' into develop
still working on feature 4
finished feature 4
starting feature 5
finished feature 5
Merge branch 'feature4' into develop
Merge branch 'develop' of github.com:michelgrootjans/git_workshop into develop
Merge branch 'feature5' into develop
Merge branch 'develop' of github.com:michelgrootjans/git_workshop into develop
bumped version to 1.1
finetuning feature 4
Merge branch 'release-1.1'