diff --git a/文档：软件需求构想和描述10.17.docx b/文档：软件需求构想和描述10.17.docx
new file mode 100644
index 0000000..2ad92bb
Binary files /dev/null and b/文档：软件需求构想和描述10.17.docx differ
diff --git a/新建文本文档.txt b/新建文本文档.txt
deleted file mode 100644
index 1e2f19f..0000000
--- a/新建文本文档.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-ssssss
-=======
-ssss
->>>>>>> remotes/origin/devolpe_cp