I finished up the style sheet
Merge branch 'styles'