init
branch commit
master commit
Merge branch 'master' into test-branch
master commit
commit branch
hallo
Merge branch 'master' into test-branch

Conflicts:
	test.html
gitignore
teste feature
release change
Merge branch 'release/testrelease'
Merge branch 'release/testrelease' into develop
Merge branch 'release/v1.0.2'
fixing stuff
Merge branch 'hotfix/fix_stuff' into develop
Merge branch 'hotfix/fix_stuff'
test1
test2
test3