Merge branch 'rtong'
fix bugs
auto fix
Merge branch 'bowen' into rtong
fix ws
Merge branch 'bowen' into rtong

Conflicts:
	app/views/stu_course.scala.html
	public/javascripts/action.js
ff
Merge branch 'rtong' into shuaiwang

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/algorithm/pre_and_core/CrossLinkedList.java
Merge branch 'shuaiwang' into rtong
Merge branch 'bowen' into Bohan-Zheng
搞定了
fix some bugs
-5 --> 96 twice bug fixed
fix conflict with rtong
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
lalala
add assign
Merge branch 'shuaiwang' into Bohan-Zheng
组长我们搞定了
fix conflict