client stage 2 bugfixing XXIV
Merge branch 'master' of https://github.com/pieron89/DS13Lab2.git