merge
conflicto resuelto
Merge branch 'master' of https://github.com/texai/demogit
Conflicto resuelto2