Merge pull request #15 from rockamorales/master

Roberto
Merge pull request #16 from rockamorales/master

Cambio de contrasena corregido
Merge pull request #34 from mackk/master

merge