deleted excess shit
Merge branch 'master' into view-html
Merge pull request #22 from jpk1215/view-html

View html