From cecc84d0978e5279c523403225b9aa1205709578 Mon Sep 17 00:00:00 2001
From: "LAPTOP-P34AMGUO\\chris" <christopher.dibetta@mail.mcgill.ca>
Date: Thu, 15 Mar 2018 16:54:54 -0400
Subject: [PATCH] Any user can view about us page - progress

---
 .idea/workspace.xml         | 320 ++++++++++++++++--------------------
 src/bodies/about.js         |  48 ++++++
 src/index.js                |   2 +
 src/navbar/navigationBar.js |   2 +-
 4 files changed, 197 insertions(+), 175 deletions(-)
 create mode 100644 src/bodies/about.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d175b27f..dcee7503 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3df8bda6-8fbd-4426-80b6-04bf8b5d37c3" name="Default" comment="" />
+    <list default="true" id="3df8bda6-8fbd-4426-80b6-04bf8b5d37c3" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/src/index.js" afterPath="$PROJECT_DIR$/src/index.js" />
+      <change beforePath="$PROJECT_DIR$/src/navbar/navigationBar.js" afterPath="$PROJECT_DIR$/src/navbar/navigationBar.js" />
+    </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -14,42 +18,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="professorLanding.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/bodies/professorLanding.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="145">
-              <caret line="47" column="19" lean-forward="false" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="19" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="classListing.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/bodies/components/classListing.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="42" column="30" lean-forward="true" selection-start-line="42" selection-start-column="30" selection-end-line="42" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="studentLanding.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/bodies/studentLanding.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="19">
-              <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="courseListing.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/bodies/components/courseListing.js">
+      <file leaf-file-name="navigationBar.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/navbar/navigationBar.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="347">
-              <caret line="32" column="29" lean-forward="true" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
-              <folding />
+            <state relative-caret-position="420">
+              <caret line="55" column="99" lean-forward="false" selection-start-line="55" selection-start-column="99" selection-end-line="55" selection-end-column="99" />
+              <folding>
+                <element signature="e#49#90#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -57,10 +33,9 @@
       <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/bodies/main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1057">
-              <caret line="66" column="19" lean-forward="false" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
+            <state relative-caret-position="147">
+              <caret line="125" column="15" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="317" selection-end-column="0" />
               <folding>
-                <element signature="e#48#89#0" expanded="true" />
                 <element signature="e#10175#10795#0" expanded="false" />
                 <element signature="e#10864#15287#0" expanded="false" />
               </folding>
@@ -68,54 +43,27 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="adminListing.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/bodies/components/adminListing.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="41" column="12" lean-forward="false" selection-start-line="41" selection-start-column="12" selection-end-line="45" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="studentListing.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/bodies/components/studentListing.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="41" column="29" lean-forward="true" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="firebase.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/firebase.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="359">
-              <caret line="22" column="1" lean-forward="false" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="145">
-              <caret line="21" column="3" lean-forward="false" selection-start-line="21" selection-start-column="3" selection-end-line="21" selection-end-column="3" />
+            <state relative-caret-position="6">
+              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
               <folding>
                 <element signature="e#0#26#0" expanded="true" />
+                <element signature="e#329#365#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="navigationBar.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/navbar/navigationBar.js">
+      <file leaf-file-name="about.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/bodies/about.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="145">
-              <caret line="61" column="40" lean-forward="false" selection-start-line="61" selection-start-column="40" selection-end-line="64" selection-end-column="41" />
-              <folding />
+            <state relative-caret-position="189">
+              <caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -156,6 +104,9 @@
       <find>window.conirm</find>
       <find>confi</find>
       <find>confirm</find>
+      <find>login</find>
+      <find>prof</find>
+      <find>login to</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -174,14 +125,11 @@
         <option value="$PROJECT_DIR$/src/structure.js" />
         <option value="$PROJECT_DIR$/public/index.html" />
         <option value="$PROJECT_DIR$/src/firebaseFunctions.js" />
-        <option value="$PROJECT_DIR$/src/index.js" />
-        <option value="$PROJECT_DIR$/src/navbar/navigationBar.js" />
         <option value="$PROJECT_DIR$/src/firebase.js" />
         <option value="$PROJECT_DIR$/src/data.js" />
         <option value="$PROJECT_DIR$/src/bodies/studentLanding.js" />
         <option value="$PROJECT_DIR$/src/bodies/components/student_Comment.js" />
         <option value="$PROJECT_DIR$/src/bodies/components/studentComment.js" />
-        <option value="$PROJECT_DIR$/src/bodies/main.js" />
         <option value="$PROJECT_DIR$/src/bodies/classSettings.js" />
         <option value="$PROJECT_DIR$/src/bodies/components/courseListing.js" />
         <option value="$PROJECT_DIR$/src/bodies/professorLanding.js" />
@@ -189,6 +137,11 @@
         <option value="$PROJECT_DIR$/src/bodies/components/adminListing.js" />
         <option value="$PROJECT_DIR$/src/bodies/components/studentListing.js" />
         <option value="$PROJECT_DIR$/src/bodies/components/classListing.js" />
+        <option value="$PROJECT_DIR$/src/bodies/main.js" />
+        <option value="$PROJECT_DIR$/src/bodies/About.js" />
+        <option value="$PROJECT_DIR$/src/index.js" />
+        <option value="$PROJECT_DIR$/src/navbar/navigationBar.js" />
+        <option value="$PROJECT_DIR$/src/bodies/about.js" />
       </list>
     </option>
   </component>
@@ -201,10 +154,11 @@
   <component name="NodeModulesDirectoryManager">
     <handled-path value="$PROJECT_DIR$/node_modules" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="823" />
-    <option name="width" value="1104" />
-    <option name="height" value="1047" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-114" />
+    <option name="y" value="81" />
+    <option name="width" value="1459" />
+    <option name="height" value="884" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -237,6 +191,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -267,6 +222,12 @@
               <item name="bodies" type="462c0819:PsiDirectoryNode" />
               <item name="components" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="ProStudent" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ProStudent" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="css" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="ProStudent" type="b2602c69:ProjectViewProjectNode" />
               <item name="ProStudent" type="462c0819:PsiDirectoryNode" />
@@ -278,7 +239,6 @@
         </subPane>
       </pane>
       <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -402,24 +362,25 @@
       <workItem from="1519885900343" duration="805000" />
       <workItem from="1520128275947" duration="8452000" />
       <workItem from="1520367300571" duration="6068000" />
+      <workItem from="1521140490380" duration="6107000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="61958000" />
+    <option name="totallyTimeSpent" value="68065000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="823" y="0" width="1104" height="1047" extended-state="0" />
+    <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <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.19324578" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19301957" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <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="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="0" 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.18735892" sideWeight="0.5104167" order="8" side_tool="true" 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="9" side_tool="false" 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.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" 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.16089386" sideWeight="0.48958334" order="10" 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.16077536" sideWeight="0.48958334" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -463,20 +424,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="26" column="9" lean-forward="false" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/bodies/studentLanding.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="690">
@@ -588,7 +535,6 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#48#89#0" expanded="true" />
             <element signature="e#10175#10795#0" expanded="false" />
             <element signature="e#10864#15287#0" expanded="false" />
           </folding>
@@ -599,13 +545,6 @@
     <entry file="file://$PROJECT_DIR$/src/bodies/components/listing.js" />
     <entry file="file://$USER_HOME$/hello_stranger/src/App.js" />
     <entry file="file://$PROJECT_DIR$/src/bodies/components/listing.js" />
-    <entry file="file://$PROJECT_DIR$/src/index.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="613">
-          <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/exercise_app/src/mains/mainPage.js" />
     <entry file="file://$PROJECT_DIR$/src/image/delete.svg">
       <provider selected="true" editor-type-id="text-editor">
@@ -658,141 +597,174 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
+    <entry file="file://$PROJECT_DIR$/src/firebaseFunctions.js" />
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/student_Comment.js" />
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/studentComment.js" />
+    <entry file="file://$PROJECT_DIR$/src/data.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+        <state relative-caret-position="609">
+          <caret line="29" column="20" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/firebaseFunctions.js" />
-    <entry file="file://$PROJECT_DIR$/public/index.html">
+    <entry file="file://$PROJECT_DIR$/src/bodies/classSettings.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="874">
-          <caret line="46" column="9" lean-forward="false" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+        <state relative-caret-position="159">
+          <caret line="88" column="36" lean-forward="false" selection-start-line="88" selection-start-column="36" selection-end-line="88" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/components/student_Comment.js" />
-    <entry file="file://$PROJECT_DIR$/src/bodies/components/studentComment.js" />
-    <entry file="file://$PROJECT_DIR$/src/data.js">
+    <entry file="file://$PROJECT_DIR$/src/firebase.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
+        <state relative-caret-position="359">
+          <caret line="22" column="1" lean-forward="false" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/adminLanding.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/courseListing.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="50" column="59" lean-forward="false" selection-start-line="50" selection-start-column="59" selection-end-line="50" selection-end-column="59" />
-          <folding>
-            <element signature="e#49#90#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="347">
+          <caret line="32" column="29" lean-forward="true" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/classLandingPage_std.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/studentListing.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="23" column="5" lean-forward="false" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
-          <folding>
-            <element signature="e#97#138#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="283">
+          <caret line="41" column="29" lean-forward="true" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/classSettings.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/adminListing.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="88" column="36" lean-forward="false" selection-start-line="88" selection-start-column="36" selection-end-line="88" selection-end-column="36" />
+        <state relative-caret-position="1701">
+          <caret line="92" column="0" lean-forward="false" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/firebase.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/components/classListing.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="359">
-          <caret line="22" column="1" lean-forward="false" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="1008">
+          <caret line="58" column="4" lean-forward="false" selection-start-line="58" selection-start-column="4" selection-end-line="58" selection-end-column="4" />
+          <folding>
+            <element signature="e#98#139#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/professorLanding.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="21" column="3" lean-forward="false" selection-start-line="21" selection-start-column="3" selection-end-line="21" selection-end-column="3" />
+        <state relative-caret-position="42">
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="17" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="n#!!doc" expanded="false" />
+            <element signature="e#48#89#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/navbar/navigationBar.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/studentLanding.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="61" column="40" lean-forward="false" selection-start-line="61" selection-start-column="40" selection-end-line="64" selection-end-column="41" />
-          <folding />
+        <state relative-caret-position="252">
+          <caret line="99" column="51" lean-forward="false" selection-start-line="99" selection-start-column="51" selection-end-line="99" selection-end-column="51" />
+          <folding>
+            <element signature="e#49#90#0" expanded="false" />
+            <marker date="1520472846033" expanded="true" signature="481:650" ph="{&quot;height&quot;: window.innerHeight...}" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/main.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/classLandingPage_std.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1057">
-          <caret line="66" column="19" lean-forward="false" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
+        <state relative-caret-position="212">
+          <caret line="38" column="108" lean-forward="false" selection-start-line="38" selection-start-column="108" selection-end-line="38" selection-end-column="108" />
           <folding>
-            <element signature="e#48#89#0" expanded="true" />
-            <element signature="e#10175#10795#0" expanded="false" />
-            <element signature="e#10864#15287#0" expanded="false" />
+            <element signature="e#97#138#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/professorLanding.js">
+    <entry file="file://$PROJECT_DIR$/src/bodies/adminLanding.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="47" column="19" lean-forward="false" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="19" />
+        <state relative-caret-position="126">
+          <caret line="17" column="21" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/studentLanding.js">
+    <entry file="file://$PROJECT_DIR$/src/index.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
+        <state relative-caret-position="882">
+          <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/components/courseListing.js">
+    <entry file="file://$PROJECT_DIR$/src/App.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="32" column="29" lean-forward="true" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
+        <state relative-caret-position="399">
+          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/components/studentListing.js">
+    <entry file="file://$PROJECT_DIR$/public/manifest.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="41" column="29" lean-forward="true" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="29" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" 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$/src/bodies/components/adminListing.js">
+    <entry file="file://$PROJECT_DIR$/public/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="41" column="12" lean-forward="false" selection-start-line="41" selection-start-column="12" selection-end-line="45" selection-end-column="30" />
+        <state relative-caret-position="966">
+          <caret line="46" column="9" lean-forward="false" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bodies/components/classListing.js">
+    <entry file="file://$PROJECT_DIR$/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="42" column="30" lean-forward="true" selection-start-line="42" selection-start-column="30" selection-end-line="42" selection-end-column="30" />
-          <folding />
+        <state relative-caret-position="6">
+          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#329#365#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/navbar/navigationBar.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="55" column="99" lean-forward="false" selection-start-line="55" selection-start-column="99" selection-end-line="55" selection-end-column="99" />
+          <folding>
+            <element signature="e#49#90#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bodies/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="125" column="15" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="317" selection-end-column="0" />
+          <folding>
+            <element signature="e#10175#10795#0" expanded="false" />
+            <element signature="e#10864#15287#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bodies/about.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/bodies/about.js b/src/bodies/about.js
new file mode 100644
index 00000000..75ec89a3
--- /dev/null
+++ b/src/bodies/about.js
@@ -0,0 +1,48 @@
+/**
+ * Created by Chris Di Betta and Nick Benseler on 2018.3.15..
+ */
+import React, { Component } from 'react';
+import{
+    Col,
+    Panel,
+    ButtonGroup,
+    Button
+} from 'react-bootstrap'
+import * as data from './../data'
+import * as firebase from 'firebase'
+
+class About extends Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            height:window.innerHeight,
+            width:window.innerWidth
+        };
+    }
+    resize = () => {
+        this.setState({width:window.innerWidth,height:window.innerHeight})
+    }
+
+
+    main(){
+        return(
+            <div class='App' style={{zIndex:1,width:this.state.width}}>
+                <div style={{height:this.state.height/3,justifyContent:'center'}}>
+                    <h1 style={{fontSize:this.state.width>1000?this.state.width/20:18,fontWeight:600,color:"#47525e"}}>About Us</h1>
+                </div>
+                <div style={{height:this.state.height/13, textAlign:'left'}}>
+                    <h1 style={{fontSize:this.state.width>1000?this.state.width/70:18,fontWeight:500,color:"#47525e",padding:0,marginLeft:100, marginRight: 100}}>
+                        ProStudent is an app that was created with students in mind. It allows students and professors to communicate in real time.
+                        Students can provide live feedback which allows professors to improve their lecture on the fly.
+                    </h1>
+                </div>
+            </div>
+        )
+    }
+
+    render() {
+        return(this.main())
+    }
+}
+export default About
diff --git a/src/index.js b/src/index.js
index e204e888..fb6fcdb2 100755
--- a/src/index.js
+++ b/src/index.js
@@ -18,6 +18,7 @@ import NavigationBar from './navbar/navigationBar'
 import StudentLanding from './bodies/studentLanding'
 import ProfLanding from './bodies/professorLanding'
 import AdminLanding from './bodies/adminLanding'
+import About from './bodies/about'
 
 const Redirection=()=>(
     <Redirect to={"/main"}/>
@@ -36,6 +37,7 @@ ReactDOM.render(
                 <Route exact path="/student/*" component={StudentLanding} />
                 <Route exact path="/prof/*" component={ProfLanding}/>
                 <Route exact path="/admin/*" component={AdminLanding}/>
+                <Route exact path="/about/*" component={About}/>
                 <Route path="/*" component={Redirection} />
             </Switch>
         </Router>
diff --git a/src/navbar/navigationBar.js b/src/navbar/navigationBar.js
index 93c76a91..159494a7 100755
--- a/src/navbar/navigationBar.js
+++ b/src/navbar/navigationBar.js
@@ -50,7 +50,7 @@ class NavigationBar extends Component {
                     </Navbar.Header>
                     <Navbar.Collapse>
                         <Nav pullRight>
-                            <NavItem eventKey={1} href="#" onClick={()=>this.setState({about:true,contactus:false})} style={{color:"#47525e", fontWeight:"bold"}}>
+                            <NavItem eventKey={1} href="/about/" onClick={()=>this.setState({about:true,contactus:false})} style={{color:"#47525e", fontWeight:"bold"}}>
                                 <p style={{color:"black", fontWeight:"bold"}}>About</p>
                             </NavItem>
                             <NavItem eventKey={2} href="#" onClick={()=>this.setState({about:false,contactus:true})}>