fix bugs
Merge branch 'bowen' into Bohan-Zheng
搞定了
fix some bugs
fix conflict with rtong
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
lalala
add assign
Merge branch 'shuaiwang' into Bohan-Zheng
组长我们搞定了
fix conflict
fix conflict with bohan branch
add assign
Merge branch 'bowen' into shuaiwang

Conflicts:
	app/controllers/CourseController.java
	app/controllers/StudyPlanController.java
Merge branch 'shuaiwang' into Bohan-Zheng
先提交一下
再提交一下
搞定
integrate algorithm
fix conflict