added conditional statement to exclude archived articles on a feed show page if this applies to the current user
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
test_articles controller and label model
Merge branch 'chore/article_controller_specs' into dev
updated my feeds
implemented 'my bookmarks' and added link in global nav
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
/feeds now redirects to public home
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
added about page
updated about page
added a rudimentary next/previous function - not foolproof yet
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
updated link size and lorem ipsum