Merge pull request DeepBlueRoboticsMentors#9 from DeepBlueRobotics/master

Changing Mentors - Deleting Talcott

Author: BonnieWolf

README.md

@@ -70,9 +70,9 @@ If you've been asked to merge changes into the production website:
  1. Right click on https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/pulls and select "Open in new window" to see a *list* of requests for changes to be merged into the production website (i.e. "pull requests"). There should be only one open pull request in the list. (If there is more than one, work with the people who are requesting that their changes be merged to figure out which one to merge.) 
  2. Click on the one pull request that is listed.
  3. Confirm that the request is to merge "commits into `DeepBlueRoboticsMentors:master from DeepBlueRobotics:master`". If the request is to merge commits from *someplace else*, you will not be able to review it by looking at the staging site, and you should ask the requester to make the changes to the staging site first.
- 4. View the staging site, https://deepbluerobotics.github.io (right click and open in a new window), and verify that it contains the desired corrections and is no worse than the production site, http://www.carlmontrobotics.org/, ideally on both a computer and a phone. 
+ 4. Review the staging site, https://deepbluerobotics.github.io (right click and open in a new window), and verify that it contains the desired corrections and is no worse than the production site, http://www.carlmontrobotics.org/, ideally on both a computer and a phone. Remember that it doesn't need to be perfect, just better than it was before. Additional changes can always be made in the future.
  5. If you have any comments, you can add them at the bottom of the pull request. Be sure to click Preview above the comment box and review your comment before submitting it.
- 6. When you are ready to merge the changes, return to the page containing the pull request, click `Merge Pull Request` and then `Confirm Merge` to merge the pull request.
+ 6. When you are ready to merge the changes, return to the page containing the pull request, at the bottom, click `Merge Pull Request` and then `Confirm Merge` to merge the pull request.
  7. It should only take a few seconds for your changes to show up at http://www.carlmontrobotics.org/. If you aren't sure whether the site has been regenerated yet, you can check https://github.com/DeepBlueRoboticsMentors/DeepBlueRoboticsMentors.github.io/deployments to see how recently the last deployment occurred. 
 
  ## Undoing Changes to the Production Website

about.md

@@ -2,18 +2,19 @@
 who_we_are:
   title: Who We Are
   image: /images/DSCF2291.JPG
-  content: >
-    FIRST Robotics Competition (FRC) Team 199, Deep Blue Robotics, is a
-    third-year team established in August of 2015 by students at Carlmont High
-    School to make STEM and business education accessible for Carlmont students
-    through the avenue of FIRST. Deep
-
-    Blue Robotics participates in FRC, the FIRST-organized robotics competition. Each year, we are handed a challenge from FIRST and have six weeks to build a robot to overcome that challenge. To learn more about FIRST and FRC, visit the FIRST website at
-
-    [firstinspires.org](http://firstinspires.org){:target="_blank"}.
-
-
-    Team 199 consists of Carlmont students, invaluable mentors, and supportive parents. Carlmont also has a Robotics Engineering class.
+  content: >-
+    Established in August of 2015, FIRST Robotics Competition (FRC) Team 199,
+    Deep Blue Robotics, gives students the opportunity to learn first-hand about
+    essential technical and business skills, inspiring them to reach out into a
+    world of opportunities for innovation and entrepreneurship. As members of
+    the team we participate in an annual competition put on by the FIRST
+    organization ([firstinspires.org](http://firstinspires.org/)). FIRST (For
+    Inspiration & Recognition of Science & Technology) organizes several
+    different competitions targeted at different grade ranges. We compete in the
+    FIRST Robotics Competition (FRC), as Team 199, Deep Blue Robotics.
+
+
+    Team 199 consists of Carlmont students, invaluable mentors, and supportive parents.
 layout: default
 permalink: /about
 title: About Us
@@ -28,47 +29,6 @@ mission:
     environment. We are dedicated to thriving as
 
     a team, and further extending our hands to greet more members of our community with the gracious professionalism and technological opportunities that FIRST has to offer.
-mentors:
-  - name: Al Davies
-    role: Mentor
-  - name: Alex Shimota
-    role: Mentor
-  - name: Bill Crook
-    role: Mentor
-  - name: Blane Stroh
-    role: Mentor
-  - name: Bonnie Wolf
-    role: Mentor
-  - name: Cameron Young
-    role: Mentor
-  - name: Charles Shanefelter
-    role: Mentor
-  - name: Chris Moropoulos
-    role: Mentor
-  - name: Cristina Tudor
-    role: Mentor
-  - name: Curt Nehring
-    role: Mentor
-  - name: David Talcott
-    role: Mentor
-  - name: Dean Brettle
-    role: Mentor
-  - name: Jim Wilfong
-    role: Mentor
-  - name: Matt Moropoulos
-    role: Mentor
-  - name: Michael Gottesman
-    role: Mentor
-  - name: Olga Strongin
-    role: Mentor
-  - name: Rene Saltzherr
-    role: Mentor
-  - name: Sally Piao
-    role: Mentor
-  - name: Shimpei Koike
-    role: Mentor
-  - name: Stoyan Gaydarov
-    role: Mentor
 history:
   title: History
   image: /images/random-image-of-team.jpg
@@ -97,10 +57,14 @@ our_mentors:
       role: Mentor
     - name: Bonnie Wolf
       role: Lead Business Mentor
-    - name: Chris Moropoulo
+    - name: Chris Moropoulos
+      role: Mentor
+    - name: Dan Deasy
+      role: School Faculty
+    - name: David Elliston
       role: Mentor
     - name: Dean Brettle
-      role: Coach, Lead Sensing & Actuation Mentor
+      role: Coach, Lead SenAct Mentor
     - name: Jim Wilfong
       role: Mentor
     - name: Jennifer Low
@@ -111,16 +75,14 @@ our_mentors:
       role: Mentor
     - name: Mike Bushue
       role: Lead Fabrication Mentor
-    - name: Michyle LaPedis
-      role: Mentor
     - role: Mentor
       name: Michyle LaPedis
     - name: Mike Gottesman
       role: Mentor
     - name: Nicole Bachelor
       role: Mentor
-    - name: Ms Carefoot Carefoot
-      role: Staff Chaperone
+    - name: Sevgi Carefoot
+      role: School Faculty
     - name: Steve Siefert
       role: Lead Design Mentor
     - name: Susan Neth
@@ -177,7 +139,7 @@ our_mentors:
 			</h3>
 	<div class="body-font">{{page.our_mentors.content | markdownify}}</div>
 	<div class="list-wrap">
-		{% for m in page.mentors %}
+		{% for m in page.our_mentors.mentors %}
 		<div class="list-chunk mentor-width">
 			<blockquote class="body-font"><strong>{{m.name}}</strong><br>-{{m.role}}</blockquote>
 		</div>
@@ -187,4 +149,4 @@ our_mentors:
 
 <!--#split-wrap creates a horizontal divider between preceding and following content-->
 <div id="split-wrap"></div>
-<!--END PAGE CONTENT-->
+<!--END PAGE CONTENT-->

images/talcott.jpg

@@ -64,9 +64,10 @@ tiger_sharks:
     - href: http://villagehostpizza.com/
       title: Village Host Pizza
       image: /images/village-host-pizza.jpg
-      content: Village Host Pizza is a pizzeria dedicated to hosting gatherings among
-        friends and family for any occasion. They support the town of Belmont
-        through donations to schools, as well as local organizations.
+      content: Village Host Pizza, located at 1017 Alameda de las Pulgas, Belmont, CA,
+        is a pizzeria dedicated to hosting gatherings among friends and family
+        for any occasion. They support the town of Belmont through donations to
+        schools, as well as local organizations.
 hammerhead_sharks:
   title: Hammerhead Sharks
   amount: $500-$749
@@ -88,13 +89,13 @@ hammerhead_sharks:
       image: /images/solidworks.png
       href: https://www.solidworks.com/
       content: SOLIDWORKS Corp. develops and markets 3D CAD design software, analysis
-        software, and product data management software.SolidWorks, is one of the
-        largest 3D software companies in the world.
+        software, and product data management software. SolidWorks, is one of
+        the largest 3D software companies in the world.
     - title: SolidProfessor
       image: /images/solid-professor.png
       href: www.solidprofessor.com
       content: SolidProfessor is an online learning platform for engineers, design
-        teams, and instructors at K12 and post-secondary schools. With a
+        teams, and instructors at K-12 and post-secondary schools. With a
         SolidProfessor offers on-demand SOLIDWORKS courses and lessons in CAD,
         CAM, BIM, engineering methods, and more.
 sponsor_us: