add redeemable attribute to deals
a lot of shit
fixed conflict
chris done styling