new recovery
Merge branch 'recovery2' into articles
new recovery branch
Merge branch 'recovery' into articles
test commit
Merge branch 'recovery' into articles

Conflicts:
	app/controllers/articles_controller.rb
space added
Merge branch 'recovery' into articles
route set