initial
Merge pull request #2 from bsan/Test1

Hoffentlich ein Konflikt!
besser?
Merge branch 'develop' into testing-bsan

Conflicts:
	conflict.txt
Merge branch 'testing-bsan' into develop

Conflicts:
	conflict.txt
Merge branch 'develop' into detachedhead-branch

Conflicts:
	conflict.txt