若干修正
Merge branch 'master' of https://github.com/KsuTeamSE2/SE2MiniTest

Conflicts:
	Project/forest.jar
Merge branch 'master' of https://github.com/KsuTeamSE2/SE2MiniTest