user delete commit
Merge branch 'shuntaro4'

Conflicts:
	app.js
	routes/user.js