Cambio Amiguitos

Yeah
Merge branch 'master' of https://github.com/Blurred-9L/TestGit

Conflicts:
	README.md