Shouldn't fig5 be deleted?
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	matlab/figures/fig5raw.tex