another change
ein branch test
ein change
test
meanwhile in master branch
Merge branch 'master' into superbranch
test
test
test
test
test
commit in master
Merge branch 'newbranch'
added a new line
changed a line
Merge branch 'leetor'
added a new line
changed
Merge branch 'blubber'

Conflicts:
	super.txt
modified readme file