User Story 19 3/4 done (Alex+Nina)
Merge branch 'master' of https://github.com/alexander-informatik/amos-project-audi