改一个
修改
修改
修改
Merge branch 'qiyu' of git@github.com:Ideal2014/Ideal.git into qiyu

Conflicts:
	SQLServerDAL/Feedback.cs
	WebBackEnd/Feedback/Feedback.aspx
	WebBackEnd/Feedback/Feedback.aspx.cs
Signed-off-by: 陈释è? <11301119@bjtu.edu.cn>  大家好！！
修改
修改
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	BLL/Teacher.cs
	IBLL/ITeacher.cs
	IDAL/ITeacher.cs
	SQLServerDAL/SQLServerDAL.csproj
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'SabrinaWang' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	SQLServerDAL/SQLServerDAL.csproj
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Signed-off-by: 陈释r <11301119@bjtu.edu.cn>
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git
modify
Merge branch 'master' of git@github.com:Ideal2014/Ideal.git into SabrinaWang