Task 3
Merge branch 'master' of https://github.com/aaronstolze/CE5_Stolze