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