Weiterarbeit an 3.3
Merge branch 'master' of https://github.com/tomaszbrue/bachelor-thesis