first commit
Merge branch 'master' of https://github.com/darkfire613/conversations

Added license remotely, merging into local