get user_info
Merge branch 'master' of github.com:mailzwj/book
修改user.js
Merge branch 'master' of github.com:mailzwj/book

Conflicts:
	routes/index.js