added back views and controller
fixed routes
Merge branch 'recovery' into articles
finalized lab 14