dkj
Added routes!
Fake commit to get it working
Merge branch 'recovery' into articles

Conflicts:
	app/controllers/articles_controller.rb