agregando nombre
Merge branch 'master' of https://github.com/monolinux/elqueganagana

Conflicts:
	README.md