initial commit
Merge branch 'master' of github.com:nic-ajohnson/chat