commit to pull
trying to commit for 2nd time, first time git froze
merging; Merge branch 'master' of github.com:schoffelen/MOUS

Conflicts:
	meg/analysis_functions/mous_artifact_eog.m
updated function at line 58