Merge pull request #5 from Elgatomontes/private/Gaston/TP1

Private/gaston/tp1
Merge pull request #6 from Elgatomontes/feature/TP1

Feature/tp1