a veces te odio git
Merge branch 'master' of https://github.com/franaisa/Gloom
Merge branch 'master' of https://github.com/franaisa/Gloom
Corrigiendo errores de merge