Conflicts:
	public/asset-manifest.json
	public/index.html
	public/precache-manifest.00371b005cc37a706cf573a998699e87.js.orig
	public/service-worker.js