Added My Profile link in nav bar for logged in users
Created article methods for content preview, recent, and popular articles
Was working in wrong file, moved methods to model.
Working content_preview method, changed recent and popular to class methods
Working recent method, changed index route for articles to show only recent articles
Added vote count column to articles table to allow for sorting by popular posts
Working on vote count column
Added My Profile link in nav bar for logged in users
Created article methods for content preview, recent, and popular articles
Was working in wrong file, moved methods to model.
Working content_preview method, changed recent and popular to class methods
Working recent method, changed index route for articles to show only recent articles
Added vote count column to articles table to allow for sorting by popular posts
fix merge conflicts
update schema
Vote count updateable upon vote button click
Able to display popular articles on main index
Fixed merge conflicts
Merge pull request #39 from ospreys-2014/article_model_methods_bex

Article model methods bex