Adding coverage
Adding coverage badge
Merge branch 'master' into forkmaster

Conflicts:
	package.json