Commit message
Christine should sync with this.
Merge branch 'master' of github.com:ambivalentduck/psychicRobot