updated stuff
merge with master
Merge pull request #32 from lrakhman/css_general

Css general