增加了已选课程模块
Merge branch 'master' of https://github.com/justinyujianhua/Course-selection-system

Conflicts:
	main.html
	person-edit.html
	person.html