Reworked gemfile, added necessary gems for testing and Heroku.
Resolved merge conflict re: Gemfile, gitignore
Resolved conflict
Merge
Bundle Update
Added version to rails in gemfile
Added authenticate user in feed model
Uncommented secret token from devise.rb initializer
Uncommented secret token
Merge branch 'master' into setup
Added feedzirra to gemfile
Reworked db schema for feeds/user relationship
Removed user validation for feeds
removed binding.pry
changes redirect path
Merge branch 'master' of https://github.com/emreiser/loopd into user_adds_feed
fixed new feeds form