gives Mark some posts, sorry Mark
Merge branch 'master' into work

Another mysterious conflict
Merge branch 'master' of github.com:lisavogtsf/awesome_blog into jesse

merge upstream master with origin branch
add one minor style change to sidebar
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
adds pages as nested route of users, apart from posts
adds working index file for pages and many helpers
Merge pull request #54 from lisavogtsf/lisa

adds Pages routes, controller, working index page, various others
add hero and buttons to home page
Merge branch 'jesse'

merge local
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

merging upstream master with local repo
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Merge branch 'home_page'
Merge pull request #56 from marklc44/master

home page hero and links
Merge pull request #57 from MooreJesseB/master

Filling out methods in post and comment controllers
got rid of seed file
resolve merge issue