conflictos
Merge branch 'dev'

* dev:
  conflictos

Conflicts:
	README.md
Revert "hola lola"

This reverts commit de879314a6518e1e9aaddb7503b217e3e80c24c4.
cambio simple
conflictos
Merge branch 'dev'

* dev:
  conflictos

Conflicts:
	README.md