doc
Merge branch 'branch3' into branch1

Conflicts:
	documento_1.txt