Merge pull request #15 from museoXela/master

dASDasd
asd

asd
Merge pull request #120 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #121 from victorbetha/master

Merge pull request #39 from museoXela/master
Merge pull request #40 from museoXela/master

szdfgh