cleanUp
Merge branch 'master' of github.com:AleMarra/SSOO-TP