Merge pull request #25 from Johnmalc/master

hjg
Merge pull request #26 from Johnmalc/master

Aufgaben
O
Merge pull request #33 from AnastasiaStudent/master

na ja..