Merge pull request #38 from museoXela/master

Cambios
Consolidacion dos

Para guardar
Merge pull request #252 from Migue4/master

Merge Migue4