creo proy en mi pc
Merge remote-tracking branch 'choose_remote_name/master' into nube

Conflicts:
	.project
agrego pie de hoja