diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5755a998780a3352b3706bc6c89e9280257b8d39
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e9987035052f276318390db9534dbdd425b2905
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/web-framework.iml b/.idea/web-framework.iml
new file mode 100644
index 0000000000000000000000000000000000000000..975d5da160117c8798507112e8ad4672f202349a
--- /dev/null
+++ b/.idea/web-framework.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index bd2cb730acb8953f053bb4efffb6c69acc969952..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# 软件开发与管理
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Instructions
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Contribution
-
-1. Fork the repository
-2. Create Feat_xxx branch
-3. Commit your code
-4. Create Pull Request
-
-
-#### Gitee Feature
-
-1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4. The most valuable open source project [GVP](https://gitee.com/gvp)
-5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.md b/README.md
index d63e54d903a205fa41d4cab0fa6e8156492ae0dc..41b64e0f917e50904d56e8633cee52b2a63a8182 100644
--- a/README.md
+++ b/README.md
@@ -38,3 +38,6 @@ http://www.cnblogs.com/coderland/p/5902878.html
- 方法：
1. 使用监听器（HttpSessionListener）完成功能
2. 加入用户退出功能
+
+
+修改 --git操作作业
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdd8dd45f4d937c65212cd377d0629bfb34780db
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,28 @@
+
+
+ 4.0.0
+
+ org.example
+ web-framework
+ 1.0-SNAPSHOT
+
+
+ 8
+ 8
+
+
+
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
+
\ No newline at end of file
diff --git a/testWork1.java b/testWork1.java
new file mode 100644
index 0000000000000000000000000000000000000000..e28e941056b95e1afed58eebbdcbdad7a84ff6a2
--- /dev/null
+++ b/testWork1.java
@@ -0,0 +1,9 @@
+import org.junit.Test;
+
+public class testWork1 {
+ @Test
+ public void testName() {
+ work1 w1 = new work1();
+ w1.name("hyb");
+ }
+}
diff --git a/work1.java b/work1.java
new file mode 100644
index 0000000000000000000000000000000000000000..cb134cd97c8b5df0222db7420f6910bcb834d834
--- /dev/null
+++ b/work1.java
@@ -0,0 +1,15 @@
+public class work1 {
+ public void name(String n) {
+ System.out.println(n);
+ }
+
+ public static void main(String[] args) {
+ System.out.println("hello");
+ System.out.println("branch");
+ System.out.println("cherry-pick");
+
+ System.out.println("merge master");
+
+ System.out.println("merge branch");
+ }
+}