Merge branch 'master' into gh-pages
Updated style.css
Merge branch 'gh-pages'