网上提交论文
Merge branch 'master' of https://github.com/littlepretty/BNUGraduateThesis

Conflicts:
	DefensePresentation/答辩决议书草稿-闫佳琪.doc