change .cshtml to html filetype
Merge branch 'mary'