test
Merge branch 'master' of https://github.com/marieshifeng/vincere

Conflicts:
	package.json
merging