修改颜色
Merge branch 'master' of github.com:glmxzz/test2

Conflicts:
	web/get_score_rooms.jsp
	web/meeting_room_info.jsp
	web/wait_student.jsp