Merge branch 'gh-pages'
favicon
Merge branch 'master' into gh-pages
favicon other pages
Merge branch 'master' into gh-pages
adding links
Merge branch 'master' into gh-pages