update
Merge branch 'master' of github.com:1000ch/syntax-highlight into gh-pages