pull request
Merge branch 'master' of https://github.com/lisongyu/training into lisongyu-master

Conflicts:
	README.md
Merge branch 'lisongyu-master'