ok~
Merge branch 'master' of https://github.com/flamelad/gitForLearn

Conflicts:
	README.md
rm file
Merge branch 'master' of https://github.com/flamelad/gitForLearn

Conflicts:
	README.md
qqq