Add npm-*.log into .gitignore.
Merge branch 'master' of github.com:Powpow-Shen/sailsTest