Merge pull request #19 from rockamorales/master

Mas modificaciones
Linea XD
Merge pull request #44 from mackk/master

admin