diff styles
Merge branch 'master' of github.com:onyxfish/clan