gemfile conflict
darn gemfile
working on stuff
fixed app contoller merge
Merge branch 'tumblr' of github.com:ashag/SeeMore into tumblr
Merge branch 'master' of github.com:ashag/SeeMore into rss
added feedzirra gem
Merge branch 'master' of github.com:ashag/SeeMore into rss
Merge pull request #13 from ashag/feed

Feed
user can add RSS URL as feed, moved twitter/tumblr search to feeds controller
changed rss add feed button to match client instructions
tesing @feed_find, found error in process
Fixed logic of creating user_feed relationship
pushing to request pull
Merge branch 'master' of github.com:ashag/SeeMore
fixed merge conflict
Changed ids to integers in db
Merge branch 'master' of github.com:ashag/SeeMore
add db migrate
Merge branch 'master' into rss