delete
delete
Merge branch 'master' of https://github.com/hansight/kunlun-agent

Conflicts:
	.gitignore