update commit
update commit
merge requirement.
ignore DS.Store
ignore .conf
ignore again
add requirement
aaa
111
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