cambio doc-rama1.txt
Merge remote-tracking branch 'origin/rama1' into rama1

Conflicts:
	doc-rama1.txt