articles commit
some changes
Merge branch 'recovery' into articles
Merge pull request #2 from fafenley/articles

Final addition of views