standard extensions
Merge branch 'master' of github.com:kode4food/junqi

Conflicts:
	junqi/cli.js