Colored fixation spot for cuing subject
put catch trial parameter epxlicitly into conditions
Made overriding of parameters work (was implemented but didn't work)
Merge branch 'master' of github.com:aecker/stim_ae