.
Merge branch 'master' of github.com:ziaxdk/zhrome-plus

Conflicts:
	package.json