Merge branch 'master' of https://github.com/danpilew/Ex5.oop.git