change README
Merge branch 'master' of github.com:zhanglei541120/study

Conflicts:
	README.md