Update style.css
merge
Merge branch 'development' into production