Solved issue of business impressions and clicks recording on their dashboard
Merge branch 'master' of https://github.com/NadiDami/deal into develop
Merge branch 'master' of https://github.com/RhysStansfield/deal into develop
Fixing rails-12factor problem
Merge branch 'master' of https://github.com/RhysStansfield/deal into develop - MBottjer updates to Customer Offers page
Fixed cucumber tests from latest merges except oauth ones
Precompiled assets for home page
gemfile lock changed, not sure why
Merge branch 'master' of https://github.com/RhysStansfield/deal
monday morning pull and merge
Production precompiled assets
Tweaks to try and fix images on Heroku
More tweaks for Heroku
Experiments for Heroku
started styling new offer page
finished new offer card with preview
Merge pull request #43 from jamesjenkinsyates/master

Offers page only shows valid offers for the user and Facebook picture.
full preference selection via jQuery
Moving business logic for dashboard from controller/view into model
Merging in JJY's work to master branch
Merge pull request #44 from HemangPatel1/master

new offer page (bar a few fixes later)