Merge branch 'master' into kundla.10

Author: adambricelis

images/ava_scherocman.jpg

@@ -22,7 +22,22 @@
         <img class="ball" src="images/onlypiconmypc.png" />
         <p>Matthew Kundla</p>
       </div>
-    
+      <div class="person-frame-inner">
+        <img class="ball" src="images/ethan_h.jpg" />
+        <p>Ethan</p>
+      </div>
+      <div class="person-frame-inner">
+        <img class="ball" src="images/super_paper_mario_for_some_reason.png" />
+        <p>Super Paper Mario</p>
+      </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>