Merge pull request #2 from museoXela/master

Merge pull request #64 from Migue4/master
Merge branch 'master' of https://github.com/museoXela/Desktop
Correción de errores

Para que el proyecto pueda ejecutarse
Merge pull request #67 from Migue4/master

Correción de Errores
Merge pull request #68 from victorbetha/master

Merge pull request #22 from museoXela/master
Merge pull request #23 from museoXela/master

sdfgh