updated styles
Merge branch 'master' of https://github.com/kcampen/test-setup