add main css to css
change main css
Merge branch 'master' into gh-pages