exemplifies merge problems

this repo is about the branches and the question of how to merge them.

So don't get irritated by that fact that the masterbranch has few commits.