ultimos cambios no commiteados antes del hito
Merge branch 'master' of https://github.com/franaisa/Gloom