gemfile conflict
darn gemfile
Fixed logic of creating user_feed relationship
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