Diego's first commit
Merge branch 'master' of github.com:saiberz/chat_game