merging in git is still strange
Merge branch 'master' of https://github.com/st-pa/a09-blauzahn.git