added conversations
Merge branch 'master' of https://github.com/drobin03/wisp