Merge pull request #20 from museoXela/master

Eventos 3
ACTUALIZACION

Se ha agregado una página de bienvenida
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