Merge pull request #11 from rockamorales/master

Cambio de contrasena corregido
Merge pull request #35 from schumy21/master

Schumy_01/02/2013