Initial commit, server and client now combined.
Merge branch 'master' of github.com:joelmatth/Chatterbox