see if I can add the favicon
Merge branch 'master' into gh-pages
update gh-pages