fix conflict in course
Merge branch 'rtong' into Bohan-Zheng
Merge branch 'Bohan-Zheng' of https://github.com/xixixhalu/sss into Bohan-Zheng
Merge branch 'rtong' into Bohan-Zheng
123
?
??
cv
yeah
j
Merge branch 'shuaiwang' into Bohan-Zheng

Conflicts:
	.gitignore
	.target/views/course_add.scala.html
	.target/views/course_edit.scala.html
	.target/views/course_list.scala.html
	conf/application.conf
Merge branch 'rtong' into Bohan-Zheng
123
bb
sb
1

1
ok
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	.gitignore
	.target/views/course_list.scala.html
	build.sbt
	conf/application.conf
123
Merge branch 'Bohan-Zheng' into rtong

Conflicts:
	app/controllers/StudyPlanController2.java