stuff
Merge branch 'master' of https://github.com/psybuzz/goldenconversations
fix syntax error