fixed lag and added questions
Merge branch 'master' of https://github.com/sarahddubs/kesha
Merge branch 'master' of https://github.com/sarahddubs/kesha

Conflicts:
	chat.js
merge