初始化github,练习使用
Merge branch 'master' of https://github.com/kongbeily/Test

Conflicts:
	readme.txt