Merge pull request #3 from RaulMoyaReyes/master

Actualizar la parte de administración
Merge pull request #4 from RaulMoyaReyes/user

Merge pull request #3 from RaulMoyaReyes/master