Updated style.css
Merge branch 'development'