Updated from work compy
Not sure why this change was made.
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	matlab/finalfig4.m
	matlab/sensitivityPaper/fig5.tex