Merge remote-tracking branch 'mcbenchviz/master'

Conflicts:
	.gitignore
	README.md
	package.json