updated css
merge
rebase
Merge branch 'master' of https://github.com/markoilicni/usb_2