another
Merge branch 'patrick'

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

hello
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
Merge branch 'dan'
trying to merge 1 tthing ever
merge
fourth commit
merge search in
Merge branch 'patrick3'merging in serch
removed a typo
merging in jeffs stuff
fixed a nesting error
added work not added in