first commit
Merge http://github.com/mackbrowne/chatApp