finalised impressions
fixed merge conflict with spareoffer page and created impressions controller and model
Incorporate Stripe, including dotenv
Fix merge conflicts
Fixed conflict issues
Merge pull request #10 from NadiDami/master

Stripe, and fixed other conflicts
Merge branch 'master' of https://github.com/RhysStansfield/deal
everything works after morning merge
impressions now also add entry to db
changed index erb to haml
added  business name to offers show page
updated post-login paths for business or user, created business dashboard page
Added Category model and category buttons on sign up form
unique impressions works
Merge pull request #11 from HemangPatel1/master

Impressions and dashboard
added business categories to business sign up form and appropriate tables
Merging in Impressions, Unique Impressions and Business Sign Up categories