Fix merge conflict
edit profile link in dropdown and sharpened logo
some styling on edit profile page
made bus sign up button smaller
Minor bug fixes
Fix click counter
updated rubbish homepage picture
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged down from upstream
Fix merge conflicts
Adjust graph size on dashboard
added default avatar
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged upstream
Fixed typo in offer.js
finished dashboard graph styling
added table shadow
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged down rhys spelling error
Merge pull request #57 from HemangPatel1/master

nav bar complete, dashboard complete
fixed the redirection to a confirmation page upon purchase by passing the payment token's id
Merge pull request #58 from MBottjer/master

fixed the redirection to a confirmation page upon purchase by passing th...
Preliminary work on Average Time to conversion for business