better error
Merge remote-tracking branch 'origin/master' into hotfix-errmsg

Conflicts:
	package.json
ignore .orig
Merge pull request #3 from graphdat/hotfix-errmsg

hotfix-errmsg