Merge pull request #73 from museoXela/master

,jhgre
Cambio de clase error

lcas
Merge branch 'master' of https://github.com/victorbetha/Desktop
Merge pull request #246 from victorbetha/master

gfhj
asdf

asdf
Merge pull request #247 from victorbetha/master

asdf
as;dlfk

asdf
Cambios en el modulo de usuarios
Merge pull request #248 from victorbetha/master

as;dlfk
Merge branch 'master' of https://github.com/museoXela/Desktop
Merge pull request #249 from Migue4/master

Consolidaciones
Merge pull request #38 from museoXela/master

Cambios