programa 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hoja1/nbproject/private/private.xml