fixed the model name for category and added basics to categories controller
basic crud on categories
Merge pull request #1 from piklowry/front_end

Front end
Merge branch 'dan'
Merge branch 'master' of https://github.com/piklowry/coupon_app

Conflicts:
	db/schema.rb
another
Merge branch 'patrick'

Conflicts:
	app/views/coupons/index.html.haml

hello
fixed the image issue on the main page
Merge pull request #5 from piklowry/dan

fixed the image issue on the main page
Merge branch 'master' of https://github.com/piklowry/coupon_app

Conflicts:
	app/views/coupons/index.html.haml
changes to reflect nested attributes in user form
 Updated with nested attributes...needs additional edits
completed nested forms, but the coupon paramters are not allowed
added other frontend elements
Mergebranch 'patrick3' need to add the changes?
second commit patrick3
Merge branch 'master' into coupon_jeff_branch
it sucks
Conflicts:
	db/schema.rb
updated the select field in that add coupon form
Merge branch 'dan'
trying to merge 1 tthing ever
merge