Renamed public activity partial correctly
activity feed with follows.
Merge branch 'master' into phil/news_feed_follows
updated gems
added follow_id to activities to track the activities shop.id
removed commented line.
assigned shop id to activity.
filtered news feed by follows.
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'phil/news_feed_follows'