更新
Merge branch 'master' of https://github.com/tangguangyao/ask

Conflicts:
	app.js
	models/socket.js
	views/header.ejs
	views/people.ejs
	views/show.ejs