category view, list, creation -- Unit 3 / Lesson 6`
Merge branch 'master' of https://github.com/benjaminEwhite/railsWikisite

Conflicts:
	app/controllers/categories_controller.rb
	app/views/categories/index.html.erb
	app/views/categories/new.html.erb
	app/views/categories/show.html.erb
	db/schema.rb