Merge branch 'staging'

Author: crfmc

_layouts/people-category.html

@@ -2,7 +2,6 @@
 layout: default
 show_sidebar: false
 ---
-
 <div class="people-page-container">
   <div class="page-header-container">
     {{ page.content }}
@@ -37,7 +36,6 @@ <h2 class="category-header">{{ category }}</h2>
                   <img src="{{ person.image }}" alt="{{ person.name }}" />
                   <div class="person-information">
                     <p class="title">{{ person.person_title }}</p>
-                    <p class="subtitle">{{ person.subtitle }}</p>
                     {% if person.additional_links %}
                       <div class="additional-links-container">
                           {% if person.additional_links.github %}
@@ -125,7 +123,10 @@ <h2 class="category-header">{{ category }}</h2>
                   <img src="{{ person.image }}" alt="{{ person.name }}" />
                   <div class="person-information">
                     <p class="title">{{ person.person_title }}</p>
-                    <p class="subtitle">{{ person.subtitle }}</p>
+                    <div>
+                      <p class="subtitle">{{ person.professional_title }}</p>
+                      <p class="subtitle">{{ person.academic_title }}</p>
+                    </div>
                     {% if person.additional_links %}
                       <div class="additional-links-container">
                           {% if person.additional_links.github %}

people/index.html

@@ -3,7 +3,7 @@
 subtitle: <br/>
 page_title: people
 layout: people-category
-description: People Description
+description: Park Lab Members and Alumni
 show_sidebar: false
 sort: status
 hide_hero: true