a lot of changes
Merge branch 'master' of https://github.com/danpilew/Ex3.oop.git