Updated Package.json
Merge branch 'master' of https://github.com/Eriatolc/pizza-commander

Conflicts:
	package.json