11
Merge branch 'master' of github.com:cqduyang/test

Conflicts:
	readme