tzzzzzzzzzzzz, the magic goes away
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering.git