update styling
Merge branch 'master' into william
Merge pull request #30 from areveal/william

William