created controller, index, show views for categories
modified index, show view
deleted cruft files
Merge pull request #1 from ronnieVoice/category_views

Category views
Merge branch 'master' of github.com:ronnieVoice/wikiful

Conflicts:
	app/views/categories/show.html.erb
added bootstrap
Bootstrap styling
Merge branch '{welcome_page}' of github.com:ronnieVoice/wikiful into {welcome_page}

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less