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
Merge pull request #53 from MooreJesseB/master

Post show now shows comments.
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
Merge branch 'jesse'

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

merging upstream master with local repo