Merging changes
Ipython file modified
Merge branch 'EAFIT' of https://github.com/bebopsan/rutinas-calibracion-slm into EAFIT

Conflicts:
	MED_CORR_FASE_IPS.m
	MED_CORR_FASE_vrs_NG.m
	im_gen.vi