CSS output
Pulled changes and resolved conflict
Update styleguide css