local testing with chrome added
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Conflicts:
	package.json