Merge pull request #4 from i-c0112/master

安安
no message
Merge branch 'master' of https://github.com/cloudwhite/RePo

Conflicts:
	README.md
no message
~~~
OK
Merge pull request #7 from peishanyen/master

OK
cloud
no message