Follwoing steps;
Merge branch 'recovery' into articles
Added route;
fake commit
Merge branch 'recovery' into articles

Conflicts:
	app/controllers/articles_controller.rb
Added article views
Merge branch 'recovery2' into articles
switched title to name