aufgabe 7 text + daten
Merge remote-tracking branch 'refs/remotes/origin/master'