new experiments
Merge branch 'master' of https://github.com/eacooper/wonder

Conflicts:
	motion_in_depth/scripts/experiment/settings/test.m
	motion_in_depth/scripts/experiment/settings/test.m.bak