category app.js
nirav's dare
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/dbConnection.js

	node_modules/mysql/node_modules/readable-stream/node_modules/string_decoder/build/node_modules/hyperzip/README.md

	node_modules/mysql/node_modules/readable-stream/node_modules/string_decoder/build/node_modules/hyperzip/index.js
	node_modules/mysql2/.npmignore
	routes/category.js
Merge branch 'master' of https://github.com/jinalijhaveri/FreeDoor

Conflicts:
	app.js