Conversation extensions
Merge branch 'master' of github.com:Dharun/Jarvis