update
Merge branch 'master' of
https://github.com/evanlan1983/my-first-git-project.git

Conflicts:
	my-first-git-project/english_studying/chinese.txt