merging changes
changed queries to reference ids, added them to queries.m. Added retailerid column to coupons