Merge pull request #19 from rugggg/master

Pull UUID and convo
Merge pull request #6 from ChapmanCPSC370/master

Merge pull request #19 from rugggg/master