#24 add ability to limit feed items
Merge pull request #25 from concerto/limit_feed_items

#24 add ability to limit feed items
fixed merge conflict