Merge branch 'master' into chats
voice-recording page added
Merge branch 'master' into chats
added main.css to gitignore
Merge branch 'master' into chats

Conflicts:
	css/main.css
Merge branch 'master' into chats

Conflicts:
	css/main.css
fixing new-index.html
moved points to header of the page
Merge branch 'master' into chats
Merge branch 'chats'