Added Category Resource
Added Category Test
"Combined SHOW and INDEX routes"
"Updated Category Controller and View"
Merge branch 'master' into category

Conflicts:
	config/routes.rb
Merge branch 'category'