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

Another mysterious conflict
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