fix conflict in course
ignore conf/application.conf

ignore
Merge branch 'bowen' into rtong
getPrereq, getCoreqin progress. commit for bogan merge
Merge branch 'rtong' into Bohan-Zheng
Merge branch 'Bohan-Zheng' of https://github.com/xixixhalu/sss into Bohan-Zheng
don't jump to help page
11
Merge branch 'rtong' into Bohan-Zheng
123
?
??
cv
yeah
course_list

course_list
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
Add help page, make eclipse runnable, make eclipse debuggable
Merge branch 'master' into rtong

Conflicts:
	.gitignore