Merge pull request #58 from museoXela/master

Merge pull request #182 from victorbetha/master
Reestructuración formulario investigaciones
Solución a conflictos
Modificación momentanea
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 #21 from museoXela/master

Merge Migue4