Changed favicon
fixed footer
Merge branch 'master' into gh-pages
Cleaned up gh-pages