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