fixed typo
minor css link tweak
Merge branch 'master' into gh-pages