rob just testing
Merge branch 'master' of github.com:ralphreid/feeds_app
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
ignore
changed heroku keys
Merge branch 'chore/configure_oauth_handle_different_environments'
ignore
Merge branch 'dev'
merged dev
Merge branch 'dev'
removed pry
removed bycryp
Merge branch 'dev'
Updates Gemfile.lock