fixed psychophysics when nf > MAXFRAMES
added grating test loop for aa
Merge branch 'OfficeCopy'
Introduced network file for recording stims, esp manual stim stuff
Merge branch 'OfficeCopy'
tested network parameter file in lab