greg* super merge
Merge branch 'master' of https://github.com/mStellmann/VSP_Aufgabe2
greg* super merge