cambios
Merge branch 'master' of https://github.com/Kaiket/repoPrueba

Conflicts:
	README.md