in progress
Merge pull request #54 from alangster/articles-show-2

in progress