Merge branch 'master' of https://github.com/btlindert/btmn-eeg

Conflicts:
	+btmn/+pipes/temp_in_epochs_pipeline.m
	+btmn/+pipes/temp_split_pipeline.m
	+btmn/+split_files/temp_split_main.m
	+btmn/+temp/main.m