Resolve weird merge issue

Somehow main css file got eaten; I re-added it manually from master and
am committing straight to gh-pages