Merge pull request #20 from museoXela/master

fasd
Merge pull request #140 from hC4stillo/master

Merge pull request #20 from museoXela/master
Merge pull request #21 from museoXela/master

jkjl25
fasdfa

asdfasd
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