fixing git failure
fixing git failure 2
Merge branch 'master' into chats

Conflicts:
	.sass-cache/7333310d16b6c5a9ecccb4c618d260963d45e97a/main.scssc
	css/main.css
	sass/_content-chats.scss
	sass/main.scss
commit
Merge branch 'master' into chats
finished working on chats window
Merge branch 'chats'
Merge branch 'master' into chats
Merge branch 'chats'
fixed chat bar on index.html