Update.
Merge branch 'master' of github.com:lotaris/git-workshop-6 into feature-shared
Merge branch 'feature-shared' of github.com:lotaris/git-workshop-6 into feature-shared