added colors to the chat
Merge branch 'master' into gh-pages
updated ghpages