merged conflicts
Merge branch 'master' of https://github.com/EIS-Bonn/Luzzu.git