feature 17:44
Merge branch 'feature-5' of https://github.com/hoczat/git-workflow into feature-5