category
Merge branch 'master' of
https://github.com/robertcao/CMPE275_Project2.git

Conflicts:
	app/models/category.js
	app/routes.js
Merge branch 'master' of
https://github.com/robertcao/CMPE275_Project2.git

Conflicts:
	app/routes.js
category
Merge remote-tracking branch 'origin/master'