pantalla casi acabada
Merge branch 'master' of github.com:aaltes/viubatea