From 13bea29bc361ad5cab7b67cb1872945661300abe Mon Sep 17 00:00:00 2001
From: bradybodily <bradybod@gmail.com>
Date: Fri, 27 Apr 2018 10:41:37 -0600
Subject: [PATCH] last fix

---
 .idea/workspace.xml                         |  40 ++++++++++----------
 conversion/__pycache__/views.cpython-36.pyc | Bin 980 -> 903 bytes
 cs2610hw7/__pycache__/urls.cpython-36.pyc   | Bin 1056 -> 1072 bytes
 cs2610hw7/urls.py                           |   1 +
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d4a8234..78bbd8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="601f9577-9354-4137-8c6e-f40020b4437a" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/conversion/views.py" afterPath="$PROJECT_DIR$/conversion/views.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cs2610hw7/urls.py" afterPath="$PROJECT_DIR$/cs2610hw7/urls.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -37,11 +38,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="urls.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="318">
-              <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
+            <state relative-caret-position="183">
+              <caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
               <folding>
                 <element signature="e#633#665#0" expanded="true" />
               </folding>
@@ -91,11 +92,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="views.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/conversion/views.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="130">
-              <caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
+              <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
               <folding>
                 <element signature="e#0#35#0" expanded="true" />
               </folding>
@@ -148,10 +149,10 @@
         <option value="$PROJECT_DIR$/conversion/resources.py" />
         <option value="$PROJECT_DIR$/conversion/serilizer.py" />
         <option value="$PROJECT_DIR$/main/views.py" />
-        <option value="$PROJECT_DIR$/cs2610hw7/urls.py" />
         <option value="$PROJECT_DIR$/conversion/urls.py" />
         <option value="$PROJECT_DIR$/main/templates/main/index.html" />
         <option value="$PROJECT_DIR$/conversion/views.py" />
+        <option value="$PROJECT_DIR$/cs2610hw7/urls.py" />
       </list>
     </option>
   </component>
@@ -513,14 +514,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.503231" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32954547" sideWeight="0.49676898" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32954547" sideWeight="0.49676898" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959612" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -710,16 +710,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/main/static/main/styles.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="600">
@@ -739,12 +729,22 @@
     <entry file="file://$PROJECT_DIR$/conversion/views.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="130">
-          <caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
+          <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
           <folding>
             <element signature="e#0#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
+          <folding>
+            <element signature="e#633#665#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/conversion/__pycache__/views.cpython-36.pyc b/conversion/__pycache__/views.cpython-36.pyc
index 6531e67971089869eca72df6479d109a9da6e7bd..a8c53789f1a1b1d00c627e6120cf352dc8876398 100644
GIT binary patch
delta 354
zcmYLDJxjzu5S`g<lD##F#RVjdAR>}h+aQQw<42>FR!UCHa%W((v2laN6;>9qm7R@$
z$I2?Lzre=YNi1a8w~yg{%xCx%%H24Y8^>Q4uk1y>J$e9eK(Dzbu%JL;iA(Ho;3dnT
zV<Yp3d4?%Zp=Bk1#*SOAxbZEiQ|SB(y1;riDE$JgPd^r50u|bT(n2F_xWqHagVWx>
zznZtRp5N$tk@n2gIre^gSD8i&IwGIA2i$V+c!X2;jpv(^mXqPclmIY7Nt0m0I0_oc
zv~-$XqHrH<8&}*9Ti;nFWzWrR)#xeFKN$Qyuc&E_STmFX1w|;B&fKAQvLDk%4}Cft
c;NLp3(JzWcUAFVt9+IMo2qH?L3=~`>zrBV;VE_OC

delta 403
zcmYL@Jx{|h5QgvkkuQ>}icl*=RbZ%42Nqb%#0m_+1XHCHkqBDkxJ-@^%D}{cEHSgP
z@N1Yd@*fyr;v5EK-FuJE@7?*)|L~)|B#F|m&-0K!N3ZuD031-1FC-ca)QF@77A(UW
zD|DQ(HK<rioQRVTGhsLdt0jWwg(#R|nS8=Z(5q;th(c=5(3DlEqz3I9S<?+6hsrbD
zc$s%H0V4@;0y-!{<Izf=2KdgVBbQHM>>oGsZhF0(HR4h&ZW^W+Ke#!@MlR>ME>%c>
zAFnj>R^@YT_i-e6sg<4LA@=M$p6$eBaHeud0vKS75uGk}h&vcFK{=pGfGV~lc7dUN
zVB473H#Xc&sizV8Dlb)!@K5?}F{l0OL}fq%ZWIPg4eU2N+UQb6xy@?e<iEA0zMb(c
GOn(8vPEdmY

diff --git a/cs2610hw7/__pycache__/urls.cpython-36.pyc b/cs2610hw7/__pycache__/urls.cpython-36.pyc
index 77f0b4597dcc8f35019cbc62946de13d9cb88151..561d2d18ffa2961de48aa7f71d178e3f9bd3e283 100644
GIT binary patch
delta 124
zcmZ3$v4KO`n3tDJG3asB8fFHD#|%h-1ITs&;^LHv%1-KR&5X@VsVpfRsjMlSP&OBg
yoz5D?k-{C!pvkkbVIvdMEr!X4%$021K+Q$mlQ%FY2=M`#EQ~yi0xUd05(EL$@D@h^

delta 107
zcmdnMv4BI_n3tC;Zt<h24rT_1#|%h-9msY7;^K&j%1+W8&5X@VsVpg+sjMkrb~;NG
sM+#RkgC_UJo{dbC?U^gtxPYpQxF+voP7vS$GFcdT7zJ2(fFuti0B39y7ytkO

diff --git a/cs2610hw7/urls.py b/cs2610hw7/urls.py
index f444b02..0984635 100644
--- a/cs2610hw7/urls.py
+++ b/cs2610hw7/urls.py
@@ -20,6 +20,7 @@ from django.urls import path, include
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('index/', include('main.urls')),
+    path('', include('main.urls')),
     path('conversion/', include('conversion.urls')),
     path('init/', include('conversion.urls')),