learn
my addition

done on 11/30/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	routes/category.js