toMerge
Merge branch 'master' of https://github.com/maximilianhuber/softwareProjekt