Fix merge conflicts
recent updates
Merge branch 'master' of https://github.com/RhysStansfield/deal
resolved conflicts
fix further conflicts
fixed typo
Merge pull request #52 from jamesjenkinsyates/master

Some JS changes
Impressions working
Javascript debugging
More javascript debugging
Merged in front end with backend
Merge pull request #54 from HemangPatel1/master

dropdown for signout
Preliminary merge of branch 'master' of https://github.com/MBottjer/deal - dynamic offers page
added
Merge pull request #56 from jamesjenkinsyates/master

added
Minor bug fixes
Fix click counter
updated rubbish homepage picture
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged down from upstream