get voxel-client demo working
add test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.js
	package.json