change name to avoid confusion
update read me
Merge remote-tracking branch 'origin/dev'

Conflicts:
	README.md
	package.json