Merge pull request #8 from museoXela/master

ACTUALIZACION
funciones2
Merge pull request #97 from victorbetha/master

actualizacion de clases
Merge pull request #95 from bryanangom/master

Merge pull request #8 from museoXela/master
Merge pull request #34 from museoXela/master

asdfghjk