some refactoring
Merge branch 'master' of https://github.com/OciCekov/OOP-Teamwork
trying to merge