Merge branch 'master' into mills.778

Author: danielmills3

images/ava_scherocman.jpg

@@ -21,7 +21,15 @@
       <div class="person-frame-inner">
         <img class="ball" src="images/super_paper_mario_for_some_reason.png" />
         <p>Super Paper Mario</p>
-    </div>
+      </div>
+      <div class="person-frame-inner">
+          <img class="ball" src="images/ava_scherocman.jpg" />
+          <p>Ava Scherocman</p>
+       </div>
+      <div class="person-frame-inner">
+        <img class="ball" src="images/john_meyer.jpg" />
+        <p>John Meyer</p>
+      </div>
     </div>
   </body>
 </html>