Merge pull request #10 from museoXela/master

actualizacion de todo
Merge pull request #35 from victorbetha/master

Merge pull request #10 from museoXela/master