Added a comment (trying to get merge-conflict)
Merge branch 'master' of ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git