favicon; inline styles
Merge branch 'master' of github.com:peat/wiki