ES
Solucionado conflicto
Merge branch 'master' of http://github.com/kasappeal/git-nuestro

Conflicts:
	manu.md