Merge branch 'master' of ssh://git.breab.org:2223/kai/MasterArbeit

# Conflicts: # Ausarbeitung/thesis.tex
1 job from master in 50 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #461
compile_pdf

00:50