First commit
Merge branch 'master' of https://github.com/EOC/conversation-dash

Initial update to conversation dash