Recovering misc solution stuff
Merge branch 'recovery' into articles
Adding resources :articles to routes.rb