added article controllers and views
Merge branch 'recovery' into articles
added resources: articles to routes
fixed article_controller merging msitake and fixed article_model syntax error