Merge branch 'master' into scherocman.4

Author: adambricelis

images/john_meyer.jpg

@@ -22,6 +22,10 @@
         <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>