Merge remote-tracking branch 'origin/master'
fixed - package.json
Merge branch 'master' of https://github.com/yuxhuang/is-apple-down