probando diffs en ST con p4merge
Merge branch 'master' of https://github.com/leoslopez/toTestGit

Conflicts:
	README.md