race condition?
Merge branch 'master' of git@github.com:ambivalentduck/psychicRobot.git