update route
Merge branch 'master' of https://github.com/chemdemo/nodeblog

Conflicts:
	server/routes/index.js