Merge pull request #17 from museoXela/master

asdfasd
Merge pull request #12 from museoXela/master

actualizar1
asdfa

asdfa
Funciones padre
Merge pull request #130 from Migue4/master

Merge pull request #8 from museoXela/master
Merge pull request #127 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #41 from museoXela/master

sbn
Ejemplo de pieza contains
Merge pull request #131 from victorbetha/master

sdf
Merge pull request #18 from museoXela/master

asdf
asdf

asdf
Merge pull request #133 from hC4stillo/master

asdf
Merge pull request #132 from bryanangom/master

__
Actualizacion

Cambios en la funcionalidad