Fix package.json
Merge branch 'master' of github.com:felgeekpe/gucci-harp-scaffold

Conflicts:
	package.json