unconflicting change offline
Merge branch 'master' of https://github.com/WinforUniRegensburg/TI