starting with feature 4
still working on feature 4
finished feature 4
Merge branch 'feature4' into develop
Merge branch 'develop' of github.com:michelgrootjans/git_workshop into develop