最新修改版UI

最新修改版UI
merge
Merge branch 'master' of https://github.com/DengZuoheng/teamProjectHD02

Conflicts:
	Hd_final/file/RANK.txt
	Hd_final/file/yc.txt
	Hd_final/src/cm/ui/MainFrame.java