initial commit
Merge branch 'master' of github.com:gmaldonado/chat_final