correct some style
Merge branch 'master' of github.com:PublicFess/3
merge