erdbeere veraendert
Merge branch 'master' of https://github.com/sonynka/infoLab3