local
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	matlab/final_fig_4n5.m