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
Merge pull request #8 from ashag/tumblr

Tumblr search function up and running!
Fixed merge conflicts in results view
Merge pull request #9 from ashag/twitter_feed

Twitter feed
Got rid of extra each do statement
Made sure uid is a string
fixed tumblr results view
Merge branch 'master' of github.com:ashag/SeeMore
Displays message when no twitter search results found
Merge branch 'master' of github.com:ashag/SeeMore
makes tumblr search seperate method, removes whitespace in tumblr search