carousel
fixed merge conf in styles.css
Merge branch 'presentationstuff'

Fixed merge conf in styles.css