listo
ACTUALIZACION
Merge pull request #16 from victorbetha/master

Merge pull request #4 from museoXela/master
Merge pull request #17 from t4r0/master

Merge from t4r0
Merge pull request #5 from museoXela/master

Taro unir