Merge pull request #16 from elihart/master

Chat now works