add two classes.
modify TestMain
add Test1 on branch 5.5.
modify Test1
add Test1 on branch 5.5.

Conflicts:
	GitTest/src/test/Test1.java

add Test2
modify Test1 again3
modify test1 again2