committing changes temporarily, rollback if necessary
premerge commit
fixed the merge conflicts
added chat functionality
removed un-necessary comments and logs
Merge pull request #105 from jjacobskind/chat_function

Chat function