Removed unused files generated by scaffolding.

Conflicts:
	app/assets/stylesheets/categories.css.scss
	app/controllers/categories_controller.rb