merge
Merge branch 'master' of github.com:ww198610/code

Conflicts:
	README.md