just commented out code for theta, and uncommented code for beta. Will make sure that JMs newest changes are not overwritten
keeping mous_bfica_pipeline to contain JM's latest changes.
Merge branch 'master' of github.com:schoffelen/MOUS

Conflicts:
	meg/analysis_scripts/mous_bfica_pipeline.m
updated. Almost complete version. Right now, catvec is missing 5 values compared to trl from trialfun_visual_word.m