changes to application and index files
Merge pull request #12 from piklowry/front_end

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

updated frontend
added search to categories page
Merge pull request #15 from piklowry/front_end

fixed create pages
Merge pull request #16 from piklowry/front_end

fixed create coupon form
added something to show
Merge branch 'master' of https://github.com/piklowry/coupon_app into dan

ahhhhh
merging
Merge pull request #14 from piklowry/dan

added search to categories page
added expiration date field to coupons
Merge pull request #17 from piklowry/dan

added expiration date field to coupons
another commit
fixed nested forms
fixed conflicts wit merging master
Fixed a number of broken items and added small featutes
Merge pull request #18 from piklowry/coupon_jeff_branch

Coupon jeff branch
friday morning commit
2nd friday commit
fixed merge conflicts