Merge pull request #26 from rockamorales/master

Modificaciones
Merge pull request #27 from rockamorales/master

Modificaciones
Merge pull request #137 from schumy21/master

schumy28Abril
Merge pull request #138 from mackk/master

mod
Merge pull request #31 from rockamorales/master

Modificaciones