Merge pull request #269 from Migue4/master

Merge Migue4
Merge pull request #77 from museoXela/master

fasdfdfg
asd

adfgdsf
Merge pull request #270 from victorbetha/master

fg
Merge pull request #48 from museoXela/master

Merge Migue4