init
Merge branch 'master' of github.com:maoqiuyun/testd

* 'master' of github.com:maoqiuyun/testd:
  Initial commit

Conflicts:
	.gitignore