sddd
Merge branch 'master' of github.com:long121268/samples

Conflicts:
	testZooKeeper/.gitignore