added views and controller
Merge branch 'recovery' into articles
everythign works