Merge pull request #1 from Informatik-13b/Maskottchen

Maskottchen
Merge pull request #2 from Informatik-13b/master

Merge pull request #1 from Informatik-13b/Maskottchen