测试冲突
Merge branch 'master' of https://github.com/YGameFrame/TestGit.git

Conflicts:
	TestGit/src/TestGit.java
	
解决了两次修改不一致的冲突