der branch mokka
changes in mokka, should force merge conflict with hello.txt
Merge branch 'mokka'
habe das nun geflickt
Conflicts:
	hello.txt