[fix]
Merge branch 'master' of github.com:zack-lin/uc-logger

Conflicts:
	index.js
	package.json
[PKG]