test
Merge branch 'master' of ssh://git@github.com/wanjiastar/testRepo.git

Conflicts:
	src/hello/HelloChina.java