增加 log 命令
Merge branch 'master' of github.com:aleechou/nodeim

Conflicts:
	.gitignore