diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2cd47ba..0550895 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e2dad4b7-2cc2-4340-b15b-775e4fd2f4fb" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/miaozaiye/oscilloscope.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/miaozaiye/clock.py" afterPath="$PROJECT_DIR$/miaozaiye/clock.py" />
     </list>
     <ignored path="PythonLearning.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -28,24 +28,26 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="playthattune.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/playthattune.py">
+      <file leaf-file-name="dragon_line.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/dragon_line.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
+              <caret line="70" column="33" selection-start-line="66" selection-start-column="4" selection-end-line="70" selection-end-column="33" />
               <folding>
-                <element signature="e#0#11#0" expanded="true" />
+                <element signature="e#531#561#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="1-20.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/1-20.py">
+      <file leaf-file-name="1-26 circle.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/1-26 circle.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-              <folding />
+              <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
+              <folding>
+                <element signature="e#66#76#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -54,7 +56,7 @@
         <entry file="file://$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
+              <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
               <folding>
                 <element signature="e#93#103#0" expanded="true" />
               </folding>
@@ -62,75 +64,79 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bouncingball.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/bouncingball.py">
+      <file leaf-file-name="oscilloscope.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/oscilloscope.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
-              <folding />
+            <state vertical-scroll-proportion="0.47140038">
+              <caret line="25" column="27" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
+              <folding>
+                <element signature="e#168#179#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="G-ball.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/G-ball.py">
+      <file leaf-file-name="gesange_mit_bild.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/gesange_mit_bild.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-              <folding />
+              <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
+              <folding>
+                <element signature="e#126#137#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="clock.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/clock.py">
+      <file leaf-file-name="playthattune.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/playthattune.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.70414203">
-              <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
               <folding>
-                <element signature="e#189#219#0" expanded="true" />
+                <element signature="e#0#11#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="1-21.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/1-21.py">
+      <file leaf-file-name="bouncingball.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/bouncingball.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
+              <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="gesange_mit_bild.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/gesange_mit_bild.py">
+      <file leaf-file-name="G-ball.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/G-ball.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="54" column="33" selection-start-line="52" selection-start-column="8" selection-end-line="54" selection-end-column="33" />
+              <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
               <folding>
-                <element signature="e#126#137#0" expanded="true" />
+                <element signature="e#10#21#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="stddraw.py" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Library/Python/3.5/lib/python/site-packages/stdpackage/stddraw.py">
+      <file leaf-file-name="_config.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/_config.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="332" column="0" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="stddraw.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/stddraw.py">
+      <file leaf-file-name="trangle_test.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaozaiye/trangle_test.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="590" column="21" selection-start-line="590" selection-start-column="21" selection-end-line="590" selection-end-column="21" />
+              <caret line="43" column="14" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
               <folding />
             </state>
           </provider>
@@ -151,7 +157,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/miaozaiye/math_exp.py" />
         <option value="$PROJECT_DIR$/miaozaiye/PepysProblem.py" />
         <option value="$PROJECT_DIR$/miaozaiye/montehall.py" />
         <option value="$PROJECT_DIR$/miaozaiye/headcount.py" />
@@ -194,14 +199,15 @@
         <option value="$PROJECT_DIR$/miaozaiye/1-20.py" />
         <option value="$PROJECT_DIR$/miaozaiye/1-21.py" />
         <option value="$PROJECT_DIR$/miaozaiye/1-192.py" />
-        <option value="$PROJECT_DIR$/miaozaiye/1-26 circle.py" />
-        <option value="$PROJECT_DIR$/miaozaiye/dragon_line.py" />
         <option value="$PROJECT_DIR$/miaozaiye/more_elise.txt" />
         <option value="$PROJECT_DIR$/miaozaiye/gesange_mit_bild.py" />
+        <option value="$PROJECT_DIR$/miaozaiye/clock.py" />
+        <option value="$PROJECT_DIR$/miaozaiye/G-ball.py" />
         <option value="$PROJECT_DIR$/miaozaiye/playthattune.py" />
+        <option value="$PROJECT_DIR$/miaozaiye/dragon_line.py" />
+        <option value="$PROJECT_DIR$/miaozaiye/1-26 circle.py" />
         <option value="$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py" />
-        <option value="$PROJECT_DIR$/miaozaiye/G-ball.py" />
-        <option value="$PROJECT_DIR$/miaozaiye/clock.py" />
+        <option value="$PROJECT_DIR$/miaozaiye/oscilloscope.py" />
       </list>
     </option>
   </component>
@@ -211,8 +217,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="13" />
-    <option name="y" value="23" />
+    <option name="x" value="-1011" />
+    <option name="y" value="197" />
     <option name="width" value="1259" />
     <option name="height" value="773" />
   </component>
@@ -273,24 +279,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PythonLearning" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PythonLearning" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miaozaiye" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="stdpackage1" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scratches" />
@@ -311,8 +299,8 @@
       <recent name="$PROJECT_DIR$/miaozaiye/stdpackage" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.clock">
-    <configuration default="false" name="playthattune" type="PythonConfigurationType" factoryName="Python" temporary="true">
+  <component name="RunManager" selected="Python.oscilloscope">
+    <configuration default="false" name="G-ball" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -325,12 +313,12 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="PythonLearning" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/playthattune.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/G-ball.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="1-31-Spirograph" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="dragon_line" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -343,12 +331,12 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="PythonLearning" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/dragon_line.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="bouncingball" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="1-26 circle" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -361,12 +349,12 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="PythonLearning" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/bouncingball.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/1-26 circle.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="G-ball" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="1-31-Spirograph" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -379,12 +367,12 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="PythonLearning" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/G-ball.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="clock" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="oscilloscope" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -397,7 +385,7 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="PythonLearning" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/clock.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/miaozaiye/oscilloscope.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <method />
@@ -531,19 +519,19 @@
       <method />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="Python.playthattune" />
-      <item index="1" class="java.lang.String" itemvalue="Python.1-31-Spirograph" />
-      <item index="2" class="java.lang.String" itemvalue="Python.bouncingball" />
-      <item index="3" class="java.lang.String" itemvalue="Python.G-ball" />
-      <item index="4" class="java.lang.String" itemvalue="Python.clock" />
+      <item index="0" class="java.lang.String" itemvalue="Python.G-ball" />
+      <item index="1" class="java.lang.String" itemvalue="Python.dragon_line" />
+      <item index="2" class="java.lang.String" itemvalue="Python.1-26 circle" />
+      <item index="3" class="java.lang.String" itemvalue="Python.1-31-Spirograph" />
+      <item index="4" class="java.lang.String" itemvalue="Python.oscilloscope" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Python.clock" />
-        <item index="1" class="java.lang.String" itemvalue="Python.G-ball" />
-        <item index="2" class="java.lang.String" itemvalue="Python.bouncingball" />
-        <item index="3" class="java.lang.String" itemvalue="Python.1-31-Spirograph" />
-        <item index="4" class="java.lang.String" itemvalue="Python.playthattune" />
+        <item index="0" class="java.lang.String" itemvalue="Python.oscilloscope" />
+        <item index="1" class="java.lang.String" itemvalue="Python.1-31-Spirograph" />
+        <item index="2" class="java.lang.String" itemvalue="Python.1-26 circle" />
+        <item index="3" class="java.lang.String" itemvalue="Python.dragon_line" />
+        <item index="4" class="java.lang.String" itemvalue="Python.G-ball" />
       </list>
     </recent_temporary>
   </component>
@@ -561,7 +549,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="13" y="23" width="1259" height="773" extended-state="0" />
+    <frame x="-1011" y="197" width="1259" height="773" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22678718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -601,13 +589,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/miaozaiye/primesieve.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaozaiye/data.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -629,13 +610,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/_config.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -811,13 +785,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/trangle_test.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="43" column="14" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaozaiye/1-18.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -825,13 +792,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/2dwalk.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaozaiye/1-19.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -860,81 +820,99 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/1-26 circle.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/stdaudio.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="42" column="71" selection-start-line="42" selection-start-column="71" selection-end-line="42" selection-end-column="71" />
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/dragon_line.py">
+    <entry file="file://$USER_HOME$/Library/Python/3.5/lib/python/site-packages/stdpackage/stddraw.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
-          <folding>
-            <element signature="e#531#561#0" expanded="false" />
-          </folding>
+          <caret line="332" column="0" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/stddraw.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="590" column="21" selection-start-line="590" selection-start-column="21" selection-end-line="590" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaozaiye/1-21.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaozaiye/clock.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/miaozaiye/more_elise.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
-          <folding />
+          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/stdaudio.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/2dwalk.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
+          <caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Library/Python/3.5/lib/python/site-packages/stdpackage/stddraw.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/1-20.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="332" column="0" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
+          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/gesange_mit_bild.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/dragon_line.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="54" column="33" selection-start-line="52" selection-start-column="8" selection-end-line="54" selection-end-column="33" />
+          <caret line="70" column="33" selection-start-line="66" selection-start-column="4" selection-end-line="70" selection-end-column="33" />
           <folding>
-            <element signature="e#126#137#0" expanded="true" />
+            <element signature="e#531#561#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/stdpackage1/stddraw.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/1-26 circle.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="590" column="21" selection-start-line="590" selection-start-column="21" selection-end-line="590" selection-end-column="21" />
-          <folding />
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
+          <folding>
+            <element signature="e#66#76#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/playthattune.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/gesange_mit_bild.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
+          <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#126#137#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/playthattune.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
+          <caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
           <folding>
-            <element signature="e#93#103#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -950,33 +928,45 @@
     <entry file="file://$PROJECT_DIR$/miaozaiye/G-ball.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+          <folding>
+            <element signature="e#10#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/_config.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/1-21.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/trangle_test.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
+          <caret line="43" column="14" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/1-20.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/1-31-Spirograph.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <folding />
+          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+          <folding>
+            <element signature="e#93#103#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaozaiye/clock.py">
+    <entry file="file://$PROJECT_DIR$/miaozaiye/oscilloscope.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.70414203">
-          <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.47140038">
+          <caret line="25" column="27" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
           <folding>
-            <element signature="e#189#219#0" expanded="true" />
+            <element signature="e#168#179#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/miaozaiye/1-26 circle.py b/miaozaiye/1-26 circle.py
index 2d819ec..029cf28 100644
--- a/miaozaiye/1-26 circle.py	
+++ b/miaozaiye/1-26 circle.py	
@@ -4,12 +4,35 @@
 import random
 import optparse
 from stdpackage import stddraw
+from stdpackage import stdarray
+from stdpackage import stdaudio
+import math
+
+SPS = 44100
+CONCERT_A = 440.0
+
+pitch0 = 6
+
+
+
+
 
 n = 200
 p = 0.3
 min = 0.05
 max = 0.2
 
+def play_tune(x,y,r):
+    pitch = (pitch0) * math.sqrt(x*x+y*y)/10
+    duration = float(r)*3
+    n1 = int(SPS*duration)
+    hz = CONCERT_A*(2**(pitch/12.0))
+    samples = stdarray.create1D(n1+1,0.0)
+    for i in range(n+1):
+        samples[i] = math.sin(2.0*math.pi*i*hz/SPS)
+    stdaudio.playSamples(samples)
+
+
 def main():
 
 
@@ -45,6 +68,8 @@ def main():
         stddraw.filledCircle(x,y,r)
 
         i +=1
+
+        play_tune(x,y,r)
         stddraw.show(10)
 
 
diff --git a/miaozaiye/1-31-Spirograph.py b/miaozaiye/1-31-Spirograph.py
index 760081f..0fb4ba6 100644
--- a/miaozaiye/1-31-Spirograph.py
+++ b/miaozaiye/1-31-Spirograph.py
@@ -7,7 +7,24 @@
 
 import sys
 import math
-from stdpackage import stddraw,stdarray
+from stdpackage import stddraw,stdarray,stdaudio
+
+SPS = 44100
+CONCERT_A = 220.0
+
+pitch0 = 3
+duration = 0.5
+
+n = int(SPS*duration)
+
+
+def play_tune(x,y):
+    pitch = (pitch0) * (x+y)/2
+    hz = CONCERT_A*(2**(pitch/12.0))
+    samples = stdarray.create1D(n+1,0.0)
+    for i in range(n+1):
+        samples[i] = math.sin(2.0*math.pi*i*hz/SPS)
+    stdaudio.playSamples(samples)
 
 def draw_spirograph(R,r,a):
     stddraw.setXscale(-40,40)
@@ -32,6 +49,7 @@ def draw_spirograph(R,r,a):
 
 
             stddraw.line(x[t],y[t],x[t+1],y[t+1])
+            play_tune(x[t],y[t])
             stddraw.show(5)
     stddraw.show()
 
diff --git a/miaozaiye/G-ball.py b/miaozaiye/G-ball.py
index 5ac964a..101b409 100644
--- a/miaozaiye/G-ball.py
+++ b/miaozaiye/G-ball.py
@@ -1,7 +1,7 @@
 #有重力效果的球
 
-
-from stdpackage import stddraw
+import math
+from stdpackage import stddraw,stdarray,stdaudio
 
 stddraw.setXscale(-1.0,1.0)
 stddraw.setYscale(-1.0,1.0)
@@ -16,14 +16,31 @@
 f = 0.005
 position1 = [(r1x,r1y)]
 
+SPS = 44100
+CONCERT_A = 330.0
+duration = 0.1
+n = int(duration*SPS)
+pitch = 1
+hz = CONCERT_A*(2**(pitch/12.0))
+
+samples = stdarray.create1D(n+1,0.0)
+for i in range(n+1):
+        samples[i] = math.sin(2.0*math.pi*i*hz/SPS)
+
 changepoint = []
+
 while True:
 
-    if abs(r1x+v1x)+RADIUS>1.0: v1x = -v1x
+    if abs(r1x+v1x)+RADIUS>1.0:
+        v1x = -v1x
+
+        stdaudio.playSamples(samples)
+
 
     v1y +=g
     if abs(r1y + v1y)+RADIUS >1.0:
         v1y = -v1y
+        stdaudio.playSamples(samples)
 
     r1x = r1x+v1x
     r1y = r1y + v1y
diff --git a/miaozaiye/clock.py b/miaozaiye/clock.py
index 9531def..60d6c09 100644
--- a/miaozaiye/clock.py
+++ b/miaozaiye/clock.py
@@ -9,11 +9,22 @@
 '''
 
 from stdpackage import stddraw
-from stdpackage import stdarray
+from stdpackage import stdarray,stdaudio
 import math
 import sys
 
 
+SPS = 44100
+CONCERT_A = 330.0
+duration = 0.1
+n = int(duration*SPS)
+pitch = 1
+hz = CONCERT_A*(2**(pitch/12.0))
+
+samples = stdarray.create1D(n+1,0.0)
+for i in range(n+1):
+        samples[i] = math.sin(2.0*math.pi*i*hz/SPS)
+
 def draw_clock(H = 0,M = 0, S = 0):
     stddraw.setXscale(-1.5,1.5)
     stddraw.setYscale(-1.5,1.5)
@@ -91,6 +102,7 @@ def draw_clock(H = 0,M = 0, S = 0):
                     stddraw.setPenRadius(0.005)
 
                     stddraw.line(0,0,Sec_L*math.cos(-angle_s),Sec_L*math.sin(-angle_s))
+                    stdaudio.playSamples(samples)
                     stddraw.show(1000)
 
 def main():
diff --git a/miaozaiye/dragon_line.py b/miaozaiye/dragon_line.py
index 53eac96..b77d514 100644
--- a/miaozaiye/dragon_line.py
+++ b/miaozaiye/dragon_line.py
@@ -25,6 +25,20 @@
 
 from stdpackage import stddraw
 import math
+from stdpackage import stdarray
+from stdpackage import stdaudio
+
+
+SPS = 44100
+CONCERT_A = 440.0
+
+pitch0 = 3
+duration = 0.5
+
+n = int(SPS*duration)
+
+
+
 
 class DragonLine:
     def __init__(self):
@@ -46,6 +60,17 @@ def turn_flow(self,wrap):
 
 dragonline = DragonLine()
 
+def play_tune(x,y):
+    pitch = (pitch0) * math.sqrt(x*x+y*y)
+
+
+    hz = CONCERT_A*(2**(pitch/12.0))
+    samples = stdarray.create1D(n+1,0.0)
+    for i in range(n+1):
+        samples[i] = math.sin(2.0*math.pi*i*hz/SPS)
+    stdaudio.playSamples(samples)
+
+
 def draw_line(dragonline,turn):
     stddraw.setXscale(-5,5)
     stddraw.setYscale(-5,5)
@@ -75,9 +100,10 @@ def draw_line(dragonline,turn):
         stddraw.setPenColor(stddraw.BLACK)
         stddraw.line(x_list[index],y_list[index],x_list[index+1],y_list[index+1])
         stddraw.setPenColor(stddraw.RED)
+        play_tune(x,y)
         # stddraw.text(x_list[index],y_list[index],'({0},{1}) to ({2},{3})'.format(x_list[index],y_list[index],x_list[index+1],y_list[index+1]))
         # stddraw.text(x_list[index],y_list[index],str(index))
         stddraw.show(50)
 
 
-draw_line(dragonline,30)
+draw_line(dragonline,20)
diff --git a/miaozaiye/oscilloscope.py b/miaozaiye/oscilloscope.py
new file mode 100644
index 0000000..c8e38de
--- /dev/null
+++ b/miaozaiye/oscilloscope.py
@@ -0,0 +1,46 @@
+#示波器，程序模拟示波器的输入，产生李萨如模式
+'''
+
+当两个相互垂直的周期扰动同时发生时，结果产生该模式图案
+
+x(t) = A_x*sin(w_x*t+theta_x)
+y(t) = A_y*sin(w_x*t+theta_y)
+
+程序带六个命令行参数： A_x,A_y,w_x,w_y,theta_x,theta_y
+'''
+
+import math
+import sys
+from stdpackage import stddraw,stdaudio
+
+def draw(x1,x0,y1,y0):
+    stddraw.line(x0,y0,x1,y1)
+    pass
+
+def main():
+    A_x,A_y,w_x,w_y,theta_x,theta_y = sys.argv[1:]
+    A_x = float(A_x)
+    A_y = float(A_y)
+    w_x = float(w_x)
+    w_y = float(w_y)
+    theta_x = float(theta_x)
+    theta_y = float(theta_y)
+    i = 0
+    X = []
+    Y = []
+    stddraw.setXscale(-4,4)
+    stddraw.setYscale(-4,4)
+    while True:
+        x = A_x*math.sin(w_x*i+theta_x)
+        y = A_y*math.sin(w_y*i+theta_y)
+        X.append(x)
+        Y.append(y)
+        if i <1:
+            pass
+        else:
+            draw(X[i],X[i-1],Y[i],Y[i-1])
+            stddraw.show(20)
+        i +=1
+
+
+main()
\ No newline at end of file