premerge commit
ttest
Merge branch 'master' of https://github.com/Clasker1/tutby_chat
premerge commit
premerge commit
premerge commit
Merge branch 'master' of https://github.com/Clasker1/tutby_chat

Conflicts:
	index.js
	views/main.ejs