Merge branch 'master' into gh-pages
Changes
Changing favicon
Merge branch 'gh-pages'