nihao hello
解决冲突
Merge branch 'master' of https://github.com/gongpb/java_test

Conflicts:
	src/com/funshion/test/Test.java