added views and things for articles from recovery
Merge branch 'recovery'
fixed missing articles controller
Merge branch 'articles'
Merge pull request #3 from jkushner/master

I forgot stuff in the last pull request