Merge branch 'gh-pages'
Added css
Merge branch 'master' into gh-pages