today's final change

tried to separate things
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	model/dbConnection.js
	routes/category.js