change file
Merge branch 'master' of https://github.com/rankun203/OnlineTeach.git

Conflicts:
	OnlineTeach/html/attendance.html
	OnlineTeach/html/compositeCheck.html
	OnlineTeach/html/coursewareUp_Down.html
	OnlineTeach/html/createWork.html
	OnlineTeach/html/generateCourseplan.html
	OnlineTeach/html/homeWork.html
	OnlineTeach/html/main.html
	OnlineTeach/html/projectReply.html
	OnlineTeach/html/teachplanUphold.html
	OnlineTeach/html/workCheck.html
	OnlineTeach/html/workReply.html
小问题，出错。
Merge branch 'master' of https://github.com/rankun203/OnlineTeach