package.json update automatically
Merge conflict resolution
Merge branch 'master' of github.com:winstwan/technical-hipster