1st commit
Merge pull request #1 from Hugenay/master

blA
Merge branch 'Sebastian'
-weitere Änderung
Merge branch 'Laurin'

Conflicts:
	README.md
        Alles zusammen