Commit changes
Merge branch 'master' of https://github.com/cwbishop/SIN

Conflicts:
	make_stimuli.m