Merge pull request #9 from rockamorales/master

Modificaciones
Merge pull request #10 from rockamorales/master

merge
Merge pull request #11 from rockamorales/master

merge
Merge pull request #12 from rockamorales/master

Mas modificaciones
Merge pull request #114 from schumy21/master

sin modificaciones schumy
Merge pull request #113 from mackk/master

merge
Merge pull request #15 from rockamorales/master

Merge