working version of css saved
fix merge conflicts
Merge pull request #35 from ospreys-2014/sidebar-css

Sidebar css