chat_stuff
fixed merge conflicts
Merge pull request #11 from egarza54/chat_stuff

chat_stuff