validation merge
Merge branch 'master' of github.com:ulikoehler/Programmierpraktikum