Back before merge
Merge branch 'master' of https://github.com/Martichoras/OOSE_Project