did important stuff
added old files back into views
Merge branch 'recovery2' into articles
added old files
Merge branch 'reco' into articles
Merge pull request #1 from andrewCMU/articles

did important stuff