test commit
Steffens zweiter Versuch
:)
add steffen.txt
Merge pull request #3 from Markus-Wurster/master

????
Merge pull request #4 from innochange/master

Konflikt beseitigt
Merge pull request #5 from Markus-Wurster/feature/joke

Feature/joke
Merge pull request #6 from innochange/feature/MyFeature

Feature/my feature