diff --git a/.idea/1807c_git.iml b/.idea/1807c_git.iml
new file mode 100644
index 0000000000000000000000000000000000000000..fa3dbc4baf71d7748562e3296a4380a5ed9809ae
--- /dev/null
+++ b/.idea/1807c_git.iml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="git_cs/settings.py" />
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+      </list>
+    </option>
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="pytest" />
+    <option name="PROJECT_TEST_RUNNER" value="pytest" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..865611434f0cce78ec2223c6c4d52a717e8ec1c1
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b9796d491af2d6424856f8d1c1276353a05023d5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/1807c_git.iml" filepath="$PROJECT_DIR$/.idea/1807c_git.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000000000000000000000000000000000000..160d58372b58f474fcfbbf8773af0e5446fd95b5
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="251e70fe-fc28-4efb-90be-c438ab2f5f29" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/lmm/urls.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/git_cs/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/git_cs/settings.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/git_cs/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/git_cs/urls.py" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="1818847520">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.opened" value="1" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="py" value="4" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="Python" value="4" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="py" value="202" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="Python" value="202" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lmm/urls.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="4" column="35" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lmm/views.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="387">
+              <caret line="19" column="33" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
+              <folding>
+                <element signature="e#630#667#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="540">
+              <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/git_cs/urls.py" />
+        <option value="$PROJECT_DIR$/git_cs/settings.py" />
+        <option value="$PROJECT_DIR$/lmm/urls.py" />
+        <option value="$PROJECT_DIR$/lmm/views.py" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="790" />
+    <option name="y" value="2" />
+    <option name="width" value="1130" />
+    <option name="height" value="1040" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
+              <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
+              <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
+              <item name="git_cs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
+              <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
+              <item name="lmm" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="1807c_git" type="Python.DjangoServer" factoryName="Django server">
+      <module name="1807c_git" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+        <env name="DJANGO_SETTINGS_MODULE" value="git_cs.settings" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="launchJavascriptDebuger" value="false" />
+      <option name="port" value="8000" />
+      <option name="host" value="" />
+      <option name="additionalOptions" value="" />
+      <option name="browserUrl" value="" />
+      <option name="runTestServer" value="false" />
+      <option name="runNoReload" value="false" />
+      <option name="useCustomRunCommand" value="false" />
+      <option name="customRunCommand" value="" />
+      <method v="2" />
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="251e70fe-fc28-4efb-90be-c438ab2f5f29" name="Default Changelist" comment="" />
+      <created>1566009227961</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1566009227961</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="632" y="3" width="903" height="832" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18934911" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Python Console" />
+      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.05" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="SciView" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="387">
+          <caret line="19" column="33" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
+          <folding>
+            <element signature="e#630#667#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lmm/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="4" column="35" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lmm/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/git_cs/settings.py b/git_cs/settings.py
index 44ee59290cbe87cb4b734dea7c9dff203fd9d06a..789eb22c69793690aeee780f63a0f83195e1d42b 100644
--- a/git_cs/settings.py
+++ b/git_cs/settings.py
@@ -43,6 +43,7 @@ INSTALLED_APPS = [
 
 
 
+
     # 'huoyanan',
 
 
@@ -101,6 +102,9 @@ INSTALLED_APPS = [
     'ning',
     'caojupeng',
 
+
+    'lmm',
+
 ]
 
 MIDDLEWARE = [
diff --git a/git_cs/urls.py b/git_cs/urls.py
index 0a10fde29c5f43eac3442343f544530a139ab9f0..c802ce8f0f6038a8c6582bb1b9617302e13a908e 100644
--- a/git_cs/urls.py
+++ b/git_cs/urls.py
@@ -20,6 +20,7 @@ urlpatterns = [
 
     path('lishan',include('lishan.urls')),
     path('',TemplateView.as_view(template_name='index.html')),
+
     path('renjunjiang/',include('renjunjiang.urls')),
 
 
@@ -132,4 +133,7 @@ urlpatterns = [
     path('caojupeng/',include('caojupeng.urls'))
 
 
+
+    path('lmm/',include('lmm.urls'))
+
 ]
diff --git a/lmm/__init__.py b/lmm/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/lmm/__pycache__/__init__.cpython-37.pyc b/lmm/__pycache__/__init__.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3331b788e21f5643e9afea8cb6a13ea344841ac0
Binary files /dev/null and b/lmm/__pycache__/__init__.cpython-37.pyc differ
diff --git a/lmm/__pycache__/admin.cpython-37.pyc b/lmm/__pycache__/admin.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cd881d89fcc3a445b5eb032168fa05bf4e3a8484
Binary files /dev/null and b/lmm/__pycache__/admin.cpython-37.pyc differ
diff --git a/lmm/__pycache__/models.cpython-37.pyc b/lmm/__pycache__/models.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c2c367a86210c8cb7c82ea8475cc45c6865a75f1
Binary files /dev/null and b/lmm/__pycache__/models.cpython-37.pyc differ
diff --git a/lmm/__pycache__/urls.cpython-37.pyc b/lmm/__pycache__/urls.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d7a61c1474e460925a88f8a3bfbefbb93bb1136a
Binary files /dev/null and b/lmm/__pycache__/urls.cpython-37.pyc differ
diff --git a/lmm/__pycache__/views.cpython-37.pyc b/lmm/__pycache__/views.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e7f2079d885b0a382cdda6c22f4aa86199b85b38
Binary files /dev/null and b/lmm/__pycache__/views.cpython-37.pyc differ
diff --git a/lmm/admin.py b/lmm/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c38f3f3dad51e4585f3984282c2a4bec5349c1e
--- /dev/null
+++ b/lmm/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/lmm/apps.py b/lmm/apps.py
new file mode 100644
index 0000000000000000000000000000000000000000..fcaaf8572902cd198f0494763eead6722cc0ead5
--- /dev/null
+++ b/lmm/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class LmmConfig(AppConfig):
+    name = 'lmm'
diff --git a/lmm/migrations/__init__.py b/lmm/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/lmm/migrations/__pycache__/__init__.cpython-37.pyc b/lmm/migrations/__pycache__/__init__.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5089514909f92df4720a34aa29d5b89f52b01f23
Binary files /dev/null and b/lmm/migrations/__pycache__/__init__.cpython-37.pyc differ
diff --git a/lmm/models.py b/lmm/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..71a836239075aa6e6e4ecb700e9c42c95c022d91
--- /dev/null
+++ b/lmm/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/lmm/tests.py b/lmm/tests.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ce503c2dd97ba78597f6ff6e4393132753573f6
--- /dev/null
+++ b/lmm/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/lmm/urls.py b/lmm/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a6580593892576775afcced3a11200d7b1b645a
--- /dev/null
+++ b/lmm/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from lmm import views
+app_name='lmm'
+urlpatterns=[
+
+    path('lmm/',views.lmm,name='lmm')
+]
\ No newline at end of file
diff --git a/lmm/views.py b/lmm/views.py
new file mode 100644
index 0000000000000000000000000000000000000000..41e52a85c8654d9f79c5f3ded03fc7587f88dced
--- /dev/null
+++ b/lmm/views.py
@@ -0,0 +1,6 @@
+from django.shortcuts import render
+
+# Create your views here.
+
+def lmm(request):
+    return  render(request,'lmm.html')
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index a84014a92079c2ad3edf0dd4ba27134308b15306..6b04e17ee0ec43e8cbd7fa9a1b1132b416618d1c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,6 +7,7 @@
 <body>
 <h1>1807C    Git     测试项目</h1>
 <ul>
+<<<<<<< HEAD
 
 
     <li><a href="{% url 'huoyanan:huoyanan' %}">霍亚楠</a></li>
@@ -38,6 +39,9 @@
 
     <li><a href="{% url 'sxh:sxh' %}">sxh</a></li>
 
+=======
+    <li><a href="{% url 'lmm:lmm' %}">刘苗苗</a></li>
+>>>>>>> lmm
     <li></li>
     <li><a href="{%url 'zhanghao:zhanghao'%}">张浩</a></li>
     <li><a href="{% url 'wsw:wsw' %}">吴双伟</a></li>
diff --git a/templates/lmm.html b/templates/lmm.html
new file mode 100644
index 0000000000000000000000000000000000000000..de31a2b9fed485be77cadabb5f1f03a2a4e73a2d
--- /dev/null
+++ b/templates/lmm.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+刘苗苗
+</body>
+</html>
\ No newline at end of file