Merge pull request #40 from museoXela/master

Merge Migue4
Merge branch 'master' of https://github.com/Migue4/Desktop
Merge pull request #255 from Migue4/master

Actualizacion