add zj-is-pretty
Merge remote-tracking branch 'origin/master'