Editado Compartido.txt para branch3
Merge branch 'branch3'

Conflicts:
	Compartido.txt