#2 working 分支 添加TestWorkingClass
#1
Merge branch 'development1' into working
#1
Merge branch 'development1' into working
Merge branch 'working'
# merge
# deleteall
# change
Merge branch 'master' into development

Conflicts:
	bin/jiese/test/main.class
	src/jiese/test/main.java