ignore conf/application.conf

ignore
Merge branch 'bowen' into rtong
getPrereq, getCoreqin progress. commit for bogan merge
don't jump to help page
11
course_list

course_list
Add help page, make eclipse runnable, make eclipse debuggable
Merge branch 'master' into rtong

Conflicts:
	.gitignore
add part of student side
add student course page
delete unuseful file
construct the crosslist

construct the crosslist
Merge branch 'bowen' into rtong
delete wrong file
Merge branch 'bowen' into rtong
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/algorithm/pre_and_core/Course_Selection.java
	conf/application.conf
Merge branch 'rtong' into shuaiwang