Merge branch 'category_views'
created controller, index, show views for categories
modified index, show view
deleted cruft files