modificar antes de merge
listo merge 2
listo merge mster a ver2
Revert "listo merge mster a ver2"

This reverts commit e77ce26e7f3f7d56b8bba15824ef88dee11f617d.
modificar antes de merge
listo merge mster a ver2
dfdfd

Conflicts:
	demo2.txt