added the search page to the tracked files
fixed merge conflict
added a date helper method, and a expiring soon method to coupon
Merge pull request #19 from piklowry/dan

Dan