what will happen here?
Merge branch 'master' of https://github.com/Zeitfrei/GitTest2