Merge pull request #12 from museoXela/master

actualizar1
Funciones padre
Merge pull request #132 from bryanangom/master

__