console logs
[fix]  socket not working
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory
Merge remote-tracking branch 'remotes/origin/nowordpatch'

Conflicts:
	routes/yo.js
	views/index.ejs
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory