prep for heroku
trying again
merged gemfile conflict
yahoo verification file
testing oauth access
sourced bash profile