almost made all my convos
Merge branch 'master' of https://github.com/Hsad/Cocaine
squashing bugs
Merge branch 'master' of https://github.com/Hsad/Cocaine