Added receiving, sending, displaying, and logging of chat messages
merge conflict
Merge pull request #116 from ollieh/master

Added receiving, sending, displaying, and logging of chat messages