Merge pull request #4 from museoXela/master

fasdfasd
Merge branch 'master' into hcastillo/PutosTodos