Merge pull request #55 from eugenefilimonov/working_branch

Working branch
css changes
Merge branch 'master' into working_branch
css