Update style.css
Update style.css
added new entries and finished
fixed css and merge for new entries
Merge branch 'master' into gh-pages