Merge pull request #19 from rockamorales/master

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

admin
Merge pull request #45 from schumy21/master

Modificaciones Schumy
Merge pull request #16 from rockamorales/master

Merge all