update package.json
Merge remote branch 'origin/master'