user register
Merge branch 'master' of github.com:haseYu/node-sample

Conflicts:
	app.js
	routes/sample.js