bugfix stage4
Merge branch 'master' of https://github.com/ckubin/dslab3.git