diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9f05d80..20ada78 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="5acf3823-b70e-4a67-bbb2-4fce75a55147" name="Default Changelist" comment="this is a test">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+=======
+<<<<<<< HEAD
+    <list default="true" id="dde6abac-9b3b-4b78-9376-ce14a383d1d7" name="Default Changelist" comment="" />
+=======
+    <list default="true" id="5acf3823-b70e-4a67-bbb2-4fce75a55147" name="Default Changelist" comment="">
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
       <change beforePath="$PROJECT_DIR$/bank_robbery.py" beforeDir="false" afterPath="$PROJECT_DIR$/bank_robbery.py" afterDir="false" />
     </list>
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -12,58 +20,107 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FUSProjectUsageTrigger">
+<<<<<<< HEAD
+    <session id="1533454160">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="3" />
+          <entry key="project.open.time.0" value="2" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.3" value="1" />
+          <entry key="project.opened" value="4" />
+=======
     <session id="1917140770">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="1" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.2" value="1" />
+<<<<<<< HEAD
           <entry key="project.opened" value="2" />
+=======
+          <entry key="project.opened" value="1" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
+<<<<<<< HEAD
+          <entry key="py" value="4" />
+=======
           <entry key="py" value="2" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
+<<<<<<< HEAD
+          <entry key="Python" value="4" />
+=======
           <entry key="Python" value="2" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
+<<<<<<< HEAD
+          <entry key="py" value="50" />
+          <entry key="txt" value="38" />
+=======
           <entry key="py" value="114" />
           <entry key="txt" value="23" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
+<<<<<<< HEAD
+          <entry key="PLAIN_TEXT" value="38" />
+          <entry key="Python" value="50" />
+=======
           <entry key="PLAIN_TEXT" value="23" />
           <entry key="Python" value="114" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
         </counts>
       </usages-collector>
     </session>
   </component>
+<<<<<<< HEAD
+=======
   <component name="FavoritesManager">
     <favorites_list name="Week_4_bank_robbery" />
   </component>
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/bank_robbery.py">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
             <state relative-caret-position="311">
               <caret line="279" selection-start-line="279" selection-end-line="279" />
+=======
+<<<<<<< HEAD
+            <state relative-caret-position="516">
+              <caret line="289" column="5" lean-forward="true" selection-start-line="289" selection-start-column="5" selection-end-line="289" selection-end-column="5" />
+=======
+            <state relative-caret-position="920">
+              <caret line="278" column="13" selection-start-line="278" selection-start-column="13" selection-end-line="278" selection-end-column="13" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+=======
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/story.py">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
     </leaf>
   </component>
   <component name="Git.Settings">
@@ -76,11 +133,19 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-5" />
+    <option name="y" value="48" />
+    <option name="width" value="1911" />
+    <option name="height" value="910" />
+=======
   <component name="ProjectFrameBounds">
     <option name="x" value="517" />
     <option name="y" value="108" />
     <option name="width" value="1285" />
     <option name="height" value="820" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -116,11 +181,105 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
+  <component name="RunManager">
+    <configuration name="bank_robbery" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="Week_4_bank_robbery" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/bank_robbery.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.bank_robbery" />
+      </list>
+    </recent_temporary>
+  </component>
+=======
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
+<<<<<<< HEAD
+      <changelist id="dde6abac-9b3b-4b78-9376-ce14a383d1d7" name="Default Changelist" comment="" />
+      <created>1602169395351</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1602169395351</updated>
+    </task>
+    <task id="LOCAL-00001" summary="working">
+      <created>1602169492929</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1602169492929</updated>
+    </task>
+    <task id="LOCAL-00002" summary="updated">
+      <created>1602171792640</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1602171792640</updated>
+    </task>
+    <task id="LOCAL-00003" summary="update">
+      <created>1602171882970</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1602171882970</updated>
+    </task>
+    <task id="LOCAL-00004" summary="updatedd">
+      <created>1602172649080</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1602172649080</updated>
+    </task>
+    <task id="LOCAL-00005" summary="a test">
+      <created>1602174402971</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1602174402971</updated>
+    </task>
+    <task id="LOCAL-00006" summary="test test">
+      <created>1602175041682</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1602175041682</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1264489" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" 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" weight="0.329718" />
+=======
       <changelist id="5acf3823-b70e-4a67-bbb2-4fce75a55147" name="Default Changelist" comment="" />
       <created>1602167452703</created>
       <option name="number" value="Default" />
@@ -153,14 +312,25 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
       <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" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.49911347" visible="true" weight="0.32798833" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5008865" side_tool="true" weight="0.32896653" />
       <window_info anchor="bottom" id="Python Console" order="10" />
+=======
+<<<<<<< HEAD
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.27765727" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+      <window_info anchor="bottom" id="Python Console" order="10" />
+=======
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
       <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" />
@@ -170,6 +340,28 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
+<<<<<<< HEAD
+    <MESSAGE value="working" />
+    <MESSAGE value="updated" />
+    <MESSAGE value="update" />
+    <MESSAGE value="updatedd" />
+    <MESSAGE value="a test" />
+    <MESSAGE value="test test" />
+    <option name="LAST_COMMIT_MESSAGE" value="test test" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/story.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-665">
+          <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bank_robbery.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="289" column="5" lean-forward="true" selection-start-line="289" selection-start-column="5" selection-end-line="289" selection-end-column="5" />
+=======
     <MESSAGE value="this is a test" />
     <option name="LAST_COMMIT_MESSAGE" value="this is a test" />
   </component>
@@ -179,8 +371,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/bank_robbery.py">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="311">
           <caret line="279" selection-start-line="279" selection-end-line="279" />
+=======
+        <state relative-caret-position="920">
+          <caret line="278" column="13" selection-start-line="278" selection-start-column="13" selection-end-line="278" selection-end-column="13" />
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
         </state>
       </provider>
     </entry>
diff --git a/__pycache__/story.cpython-35.pyc b/__pycache__/story.cpython-35.pyc
new file mode 100644
index 0000000..4d0684f
Binary files /dev/null and b/__pycache__/story.cpython-35.pyc differ
diff --git a/bank_robbery.py b/bank_robbery.py
index ff635b2..c753c53 100644
--- a/bank_robbery.py
+++ b/bank_robbery.py
@@ -20,6 +20,14 @@ def starter():
           "<c> to Continue ")
 
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+=======
+>>>>>>> 7fee0b9d2d225181e10cc2b318b76d24bb7c768a
+>>>>>>> 16be047bcc3584b94dabe1f08567ee1a0a58e06b
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f
     while True:
         enter = input("").lower()
         if enter == "c":
@@ -277,3 +285,13 @@ def range_rover():
 
 starter()
 
+<<<<<<< HEAD
+=======
+
+
+
+
+#test
+print("a test")
+
+>>>>>>> c55eb041b1a543f6e5ce9bb73a345001576e9d1f