updated to show learning of OOP
Merge branch 'master' of https://github.com/Valdreon/Learning