..
Merge branch 'master' of https://github.com/myTestChen/TestTeam.git

Conflicts:
	TestGitTeam/src/com/czy/TestA.java
	TestGitTeam/src/com/czy/TestTeam.java