Merge pull request #2 from museoXela/master

usuario 2
ACTUALIZACION

actualizacion de categoria coleccion error eventos investigacion piezas
y de errores se agrego el error de modificar que sera id 4
Merge pull request #29 from victorbetha/master

ACTUALIZACION
Merge pull request #9 from museoXela/master

asdf
Merge pull request #31 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Clases

Usuario, publicacion, pais
Merge pull request #33 from victorbetha/master

Merge pull request #9 from museoXela/master
Merge pull request #32 from bryanangom/master

Merge pull request #2 from museoXela/master
Merge pull request #10 from museoXela/master

actualizacion de todo
Clases compuestas
Merge pull request #34 from bryanangom/master

Clases compuestas
Merge pull request #35 from victorbetha/master

Merge pull request #10 from museoXela/master
Merge pull request #3 from museoXela/master

fasdfa