changed Procfile
rename unicorn config file
changed procfile back, testing to see if that fixes sidekiq not working
made changes to Procfile, and unicorn.rb
Revert "rename unicorn config file"

This reverts commit 475d06d6db58d95f96464b2685609d0527ddd721.

Reverting to old commit before sidekiq stopped working
rename unicorn file
added sidekiq console
mailers working in dev, testing in production
Merge pull request #44 from yutakahoulette/wednesday_afternoon

browse view is functional and passably styled. still working on sortable.
merging upstream
Added Mandrill Gem
commented out mandrill gem, attempting through addon instead
updated production smtp to reflect mandrill credentials
Merge pull request #46 from jeromeall/mailers

Mailers
merging upstream
my attempt at fixing scss merge conflicts
Merge pull request #47 from yutakahoulette/wednesday_afternoon

forgot password and body height fixed
fixed merge conflict
removing signin drop down styling to see if it will make the drop down work in heroku
taking out drop down sign in, replacing with link to sign in page