ss commit
local commit
local one commit 恢复测试程序
Merge remote-tracking branch 'github/local_one'

Conflicts:
	class/test/PalmTest.class
	src/test/PalmTest.java