Pulling latest updates
Merge branch 'master' of https://github.com/RhysStansfield/deal
Merge branch 'master' of https://github.com/RhysStansfield/deal
Fixed follow and impression tests
Merge branch 'master' of https://github.com/RhysStansfield/deal
sexified notice and alerts
Side slide out for preferences and updated Seeds.rb
Ajaxified offers page for customers
Merge in further CSSing and JS from Hemang
Merging in changes from Nadia
More AJAX fixes
added favicon
edited business dashboard, created hardcoded offers index, created new login partial in erb
Merging in updates from James JenkinsYates
Merging in further CSS updates from Hemang
fix further conflicts