added login with reddit option
added tumblr login option
reworked db json
Merge pull request #34 from shrutijalewar/views

bug fix in message.jade, deleted random npm log that wound up in views d...
texting works for messaging and when shanked
message.jade merge conflict resolved
Merge pull request #35 from shrutijalewar/backend-setup

texting works for messaging and when shanked
email works
Merge pull request #36 from shrutijalewar/backend-setup

email works
bribes now email upon checkout
Merge pull request #37 from shrutijalewar/backend-setup

bribes now email upon checkout
merge conflicts resolved
Merge pull request #17 from shrutijalewar/login

Login
tumblr config fixed
Merge pull request #38 from shrutijalewar/login

tumblr config fixed
encrypted keys
commenting out oauth until setup
making tests pass
Merge pull request #39 from shrutijalewar/backend-setup

encrypted keys
Update README.md