fixed typo
Merge branch 'master' into gh-pages
fixing css issues
Merge branch 'gh-pages'