changes to application and index files
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
Merge branch 'patrick3'
fixed merge conflict