fixed the model name for category and added basics to categories controller
basic crud on categories
Merge branch 'dan'
Merge branch 'master' of https://github.com/piklowry/coupon_app

Conflicts:
	db/schema.rb