^Merge branch 'master' of ssh://puls01.eam.uni-erlangen.de:30001/cp1_ws19/exercise_1