hola
Merge branch 'master' of https://github.com/dimartiro/testConflictos

Conflicts:
	README.md