add model category
Merge branch 'master' of github.com:liveidea/codechallange

Conflicts:
	db/schema.rb
new category model