ric's default css
Merge branch 'master' into edi