Fix merge conflicts
recent updates
Merge branch 'master' of https://github.com/RhysStansfield/deal
removed styling for width of date fields
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged with master branch
Merge pull request #52 from jamesjenkinsyates/master

Some JS changes
Impressions working
Javascript debugging
added dropdown for signout
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
Merge pull request #56 from jamesjenkinsyates/master

added
Added teaser image and it loads on the offers page, added it to edit and new views