Merge basic.css from gh-pages branch