correciones
Merge remote-tracking branch 'origin/master'

Conflicts:
	Informe_Final_VF4.doc