Merge branch 'chats'
fixed chat bar on index.html
added content to Chats box
Merge branch 'master' into chats

Conflicts:

.sass-cache/7333310d16b6c5a9ecccb4c618d260963d45e97a/_content-chats.scss
c