Created the categories model and added resources to a category
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
	spec/models/resource_spec.rb