Final submission
Merge branch 'master' of github.com:FHCampus-ITTBA13/Submission-Waldauf