update
Merge branch 'master' of github.com:DeanXu/javascript-code-style