add probe contrasts between 56 and 99
Code to analyze sptial masking data
No changes
Temp

Temp
Added variable to limit fs

Mask and probe contrasts run over different levels. This is now set in
two variables…
Merge branch 'master' of https://github.com/wadelab/flyCode

Conflicts:
	analyzeData/flyTV/flytv_tempAnalyzeMask.m
	collectData/flyTV/flytv_plaidShuffle2.m
	generalToolboxFunctions/generalDataAnalysis.m
Changed small to capital 'A' in filter

Directory file filter now looks for Analysis not analysis
Added contrast indices

..so that we can plot data with different levels of probe and mask
contest easily.
Look at IM

Plotting 1F1+1F2
Functions to deal with bin lengths

Compute legal inputs and analysis durations based on monitor refresh
rate
Updates
Merge branch 'master' of https://github.com/wadelab/flyCode

Conflicts:
	analyzeData/flyTV/flytv_tempAnalyzeMask.m
	collectData/flyTV/flytv_plaidShuffle2.m
Merging changes to plaid shuffle2
Merge branch 'master' of https://github.com/wadelab/flyCode

Conflicts:
	analyzeData/flyTV/flytv_tempAnalyzeMask.m
	collectData/flyTV/flytv_plaidShuffle2.m