conflict revert

Conflicts:
	DisplayInstructs2.m
	ECOG_Number_Absolute_NL.m