cc: please add background codes in router
Merge branch 'master' of https://github.com/wenqf11/watt

Conflicts:
	app.js
	routes/index.js