diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a7fdda9
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ade76c0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.obsidian/workspace.json
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index e709d1e..09c358c 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "DEADLINE"
             }
+          },
+          {
+            "id": "9b6c18a21b5ab104",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -177,17 +192,24 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "61794e0c5a3743ba",
+  "active": "9b6c18a21b5ab104",
   "lastOpenFiles": [
+    "个人总纲和进度监督/DEADLINE.md",
+    "conflict-files-obsidian-git.md",
+    "超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg",
+    "超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg",
+    "超级备忘/激光原理/激光原理.md",
+    "超级备忘/激光原理",
+    "超级备忘/机器学习/机器视觉.md",
+    "超级备忘/图像处理/数字图像处理.md",
+    "超级备忘/图像处理",
     "超级备忘/课内备忘/课表.md",
     "超级备忘/课内备忘/Pasted image 20260313115708.png",
     "个人日记/2026-03-08.md",
     "个人日记/2026-03-09.md",
     "个人日记/2026.3.8.md",
-    "conflict-files-obsidian-git.md",
     "超级备忘/光纤通信/光纤通信.md",
     "超级备忘/光纤通信",
-    "个人总纲和进度监督/DEADLINE.md",
     "超级备忘/课内备忘/截屏2026-03-09 00.21.23.png",
     "超级备忘/机器学习/实验课.md",
     "技能树/校园网/校园网通过openwrt绕过校园网多设备检测.md",
@@ -203,8 +225,6 @@
     "技能树/观背的饲养",
     "技能树/校园网",
     "技能树/moonlight-sunshine串流",
-    "技能树/frp内网穿透技术",
-    "技能树",
     "rm常用库/c板常用接口.md",
     "rm常用库/Pasted image 20260205113522.png",
     "rm常用库/Pasted image 20260205113541.png",
@@ -218,11 +238,6 @@
     "零碎的知识/nginx配置.md",
     "零碎的知识/ubuntu设置swap交换内存.md",
     "零碎的知识/win11激活.md",
-    "零碎的知识/vscode免密.md",
-    "零碎的知识/git备忘.md",
-    "零碎的知识/git快捷指令.md",
-    "零碎的知识/clould code.md",
-    "Pasted image 20260204203012.png",
-    "Pasted image 20260205113421.png"
+    "零碎的知识/vscode免密.md"
   ]
 }
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 0000000..d8bbd4f
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,17 @@
+# Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .obsidian/workspace.json
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```
\ No newline at end of file
diff --git a/超级备忘/.DS_Store b/超级备忘/.DS_Store
new file mode 100644
index 0000000..b49d63d
Binary files /dev/null and b/超级备忘/.DS_Store differ
diff --git a/超级备忘/光纤通信/光纤通信.md b/超级备忘/光纤通信/光纤通信.md
index 8294fc8..ecfb12c 100644
--- a/超级备忘/光纤通信/光纤通信.md
+++ b/超级备忘/光纤通信/光纤通信.md
@@ -1,2 +1,5 @@
 40%平时成绩
 60%考试成绩
+
+
+完成课内的习题作业
diff --git a/超级备忘/图像处理/数字图像处理.md b/超级备忘/图像处理/数字图像处理.md
new file mode 100644
index 0000000..9eee87c
--- /dev/null
+++ b/超级备忘/图像处理/数字图像处理.md
@@ -0,0 +1 @@
+离散余弦变换、小波变换
\ No newline at end of file
diff --git a/超级备忘/机器学习/机器学习.md b/超级备忘/机器学习/机器视觉.md
similarity index 78%
rename from 超级备忘/机器学习/机器学习.md
rename to 超级备忘/机器学习/机器视觉.md
index 3a04e71..6310aeb 100644
--- a/超级备忘/机器学习/机器学习.md
+++ b/超级备忘/机器学习/机器视觉.md
@@ -1,4 +1,4 @@
-考察课，无考试
+考察课，无考试，开卷考试
 有实验报告
 考勤，提问，作业
 # 照明
diff --git a/超级备忘/激光原理/激光原理.md b/超级备忘/激光原理/激光原理.md
new file mode 100644
index 0000000..e69de29
diff --git a/超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg b/超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg
new file mode 100644
index 0000000..a6de09b
Binary files /dev/null and b/超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg differ
diff --git a/超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg b/超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg
new file mode 100644
index 0000000..f4d7d6c
Binary files /dev/null and b/超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg differ
diff --git a/超级备忘/课内备忘/课表.md b/超级备忘/课内备忘/课表.md
index f3c8dca..a281a6e 100644
--- a/超级备忘/课内备忘/课表.md
+++ b/超级备忘/课内备忘/课表.md
@@ -1 +1 @@
-![[Pasted image 20260313115708.png]]
\ No newline at end of file
+![[Pasted image 20260313115708.png|697]]
\ No newline at end of file