Models Updated
Models Updated

Conflicts:
	app/views/comments/_form.html.haml
	app/views/comments/index.html.haml
	app/views/comments/show.json.jbuilder
	app/views/sub_categories/_form.html.haml
	app/views/sub_categories/index.html.haml
	app/views/sub_categories/index.json.jbuilder
	app/views/sub_categories/show.html.haml
	app/views/sub_categories/show.json.jbuilder
	db/schema.rb