Merge pull request #58 from museoXela/master

Merge pull request #182 from victorbetha/master
Merge pull request #20 from museoXela/master

Eventos 3
Merge pull request #184 from JEscalanteGT/master

Re-Investigaciones
Merge pull request #185 from victorbetha/master

Merge pull request #58 from museoXela/master
ACTUALIZACION

Se ha agregado una página de bienvenida
Merge pull request #59 from museoXela/master

shfdghjk
FIXED

Se han eliminado algunos conflictos
Merge pull request #186 from victorbetha/master

Merge pull request #59 from museoXela/master
Merge pull request #187 from Migue4/master

Merge pull request #20 from museoXela/master
Merge pull request #60 from museoXela/master

bvnm
ACTUALIZACION
Merge pull request #21 from museoXela/master

Merge Migue4
Merge pull request #188 from Migue4/master

Merge pull request #21 from museoXela/master
ACTUALIZACION

asdlfja;sdv
Merge pull request #189 from victorbetha/master

dgfhgjkhjk
Merge pull request #61 from museoXela/master

bnm,
Merge pull request #22 from museoXela/master

Merge Migue4
ACTUALIZACION

Cambios en la ventana principal, mejora en el estilo del menú
Merge branch 'master' of https://github.com/museoXela/Desktop
Instalaciones

Cambios