Conflict Commit
Merge
Merge branch 'master' of https://github.com/PhilippGrulich/HAW-SE2-projecthorse.git