Merge pull request #45 from museoXela/master

asdxfvcbnm,
Merge pull request #141 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #142 from victorbetha/master

Merge pull request #45 from museoXela/master
Merge pull request #46 from museoXela/master

gfhjk
Merge pull request #9 from museoXela/master

Merge Migue4
Merge pull request #143 from Migue4/master

Merge pull request #9 from museoXela/master
ACTUALIZACION

as;ldfj;asd
Merge pull request #144 from victorbetha/master

actualizacion error
ACTUALIZACION

asdlfkja;sdlfja
Merge pull request #145 from victorbetha/master

ACTUALIZACION
Usuarios

Para guardar
Merge pull request #146 from Migue4/master

Usuarios
Modificar

Modificar un usuario
Merge pull request #147 from Migue4/master

Modificar
ACTUALIZACION

descripcion de actualizacion
Merge pull request #148 from victorbetha/master

ACTUALIZACION
Merge pull request #47 from museoXela/master

ghjkl
ACTUALIZACION

Cambios en los estilos
Merge pull request #149 from victorbetha/master

Merge pull request #47 from museoXela/master
Merge pull request #22 from museoXela/master

fasdfa