[WORKING] Refactoring code. Preparing 3rd iteration.
Merge branch 'master' of https://github.com/Difusal/LPOO-Project