Fix merge conflict
Fix merge conflicts
Sorting out CSS for customer offer show page
Merge branch 'master' of https://github.com/RhysStansfield/deal
Added teaser image and it loads on the offers page, added it to edit and new views
Business logo now dynamic throughout
Follow button and offers homepage styling
fixed dynamic creation of businesses in categories with styling
Seed data
Dynamic offers cards pictures - JJY
james changed some routes, possibly broke everything
changed business index to erb and changed explore to discover in navbar for user
Merge pull request #60 from HemangPatel1/master

styled offers feed page
Merge branch 'master' of https://github.com/RhysStansfield/deal - updates from Hemang
Update to average time per conversion method in business model
Fix follow.jbuilder for creating cards
Fixing Stripe button
Fix merge conflicts
initial style of discover page
set default profile pic