Update package.json to point to correct git repo
Merge remote-tracking branch 'origin/master'