Facebook buttons and further testing
Concluding merge
HAML Glory
HAML Glory Conflict Resolution
Merge pull request #9 from jamesjenkinsyates/master

HAMLised and Glory
Minor tweak to _login.html.haml
Incorporate Stripe, including dotenv
Fix merge conflicts
Fixed conflict issues
Merge pull request #10 from NadiDami/master

Stripe, and fixed other conflicts
Merge branch 'master' of https://github.com/RhysStansfield/deal
everything works after morning merge