bug fix in the way loadMatrix is handled in ret code
gunjou params file update for 1280 x 800 display
initial commit for attentional meg experiment code
No real changes, only attempt to add staircase, but this is removed
foo
added attention staircase code for MEG experiments
psychophysics adjustments, color part of fixation cross white
changes for fixation cross with laterality color cue
Change threshold and plotting functions
new calibration for meg display
calibration files for meg at nyu
Merge branch 'attention_eline' of https://github.com/vistalab/vistadisp into attention_eline
changes to fixation sequence for attention MEG experiment
edits to add second, distractor probe to attention MEG experiment
add in dummy trials to staircase
Merge branch 'attention_eline' into meg_compatible

Conflicts:
	Applications2/Retinotopy/standard/retMenu.m
	exptTools2/experimentControl/showScanStimulus.m