another
Merge branch 'patrick'

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

hello
Merge branch 'master' of https://github.com/piklowry/coupon_app

Conflicts:
	app/views/coupons/index.html.haml
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
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
Merge pull request #12 from piklowry/front_end

added work not added in
updated frontend
Merge pull request #13 from piklowry/front_end

updated frontend