merged impressions with categories
Merge branch 'master' of https://github.com/RhysStansfield/deal
Merge pull request #14 from jamesjenkinsyates/master

Time Windows Working.
homepage redirect based on user or business or nil
Merge pull request #15 from HemangPatel1/master

homepage redirect based on user or business or nil
Merging in Hemangs updates - redirecting users to offers page on sign in
added angular gem and angular to new offers
Merge pull request #16 from HemangPatel1/master

added angular gem and angular to new offers
Users can select categories of interest and their preferences remain upon reloading
Merge branch 'master' of https://github.com/RhysStansfield/deal into develop

Merging in Angular JS basic implementation
Fixing twc fix
Merging in updated Time Window fixes and cucumber fixes from James
Minor bug fix in cucumber tests
Passing tests for category selection
Merged in updates from Michael and Nadia on categories selection
Fixed Stripe bug to convert pence to pounds
newest updates
Merge branch 'master' of https://github.com/RhysStansfield/deal
Add db cleaner
Fixed conflicts after merge