added code for balancing trials but this part is comment out so that the script can be ran as the original version
updated script to recognize new naming system of files
trialfun now calls "auditory_word", everything else the same.
removed {1}
updated scripts
Merge branch 'master' of github.com:schoffelen/MOUS

Conflicts:
	meg/analysis_scripts/mous_erf_pipeline.m
	meg/analysis_scripts/mous_preprocessing_pipeline.m
	meg/trialfun/trialfun_visual_word.m
updated script to adapt to the number of trial in trialfun. This allows for participanst who do not have all 240 trials to still have their data processed for quality check
updated to be able to created eps files for participants who did not complete all 240 trials