test-code
Merge branch 'master' of https://github.com/chunhai999/test-code

Conflicts:
	README