Bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	organize_stimuli.m
	plot_stimuli.m