Merge pull request #20 from jpk1215/view-html

View html
git ignore changed
fixed conflict
added favicon and changed content copy
Merge branch 'master' into view-html