Merge pull request #3 from museoXela/master

actualizar
Funciones1

Funciones version 1
Merge pull request #45 from bryanangom/master

Merge pull request #3 from museoXela/master
Merge pull request #46 from victorbetha/master

Merge pull request #16 from museoXela/master
Merge pull request #17 from museoXela/master

asfd