Merge pull request #2 from museoXela/master

usuario 2
Merge pull request #2 from museoXela/master

asljdfa
Trabajo

funciones para:
-caja
-sala
-traslado
-vitrina
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