finally! helen's last changes
Merge branch 'master' of http://github.com/geektrainer/css-style.git