Created Feeds model, dropped Prey model
Removed prey controller, added tumblr and twitter feed controllers
Created user_feed join table and model
created feeds controller
Creates user_feed relationship
Can't follow a user you're already following
Fixed merge conflicts in results view
Merge pull request #9 from ashag/twitter_feed

Twitter feed