Merge pull request #6 from museoXela/master

25/10/14
comentario
clase1
Merge pull request #1 from museoXela/master

actualiacion mia
Merge pull request #84 from kaliman2014/master

Merge pull request #1 from museoXela/master
Merge pull request #85 from bryanangom/master

nuevo
Merge pull request #86 from victorbetha/master

Merge pull request #28 from museoXela/master
Merge pull request #29 from museoXela/master

actualizacion