updated with chats block
updated chats
replaced images
A little refactor of code
Merge branch 'chats'

Conflicts:
	css/main.css
merging
merge again
Update .gitignore
fixing gitignore
adding main.css
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