changed trigger to conditionID in makeSSVEPStim.m and updated this option