Added changes to recovery branch
Merge branch 'recovery' into articles
Added articles resources to routes.rb