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

ssadsads
Usuarios

adsasa
Merge branch 'master' of https://github.com/Migue4/Desktop

Conflicts:
	MuseoCliente/modUsuarios/modUsuario.xaml
Merge pull request #155 from Migue4/master

dsfdsf