Merge branch 'master' into castaneda.53

Author: maxdg99

images/Cameron_Millar.jpg

@@ -111,6 +111,10 @@
             <img class="ball" src="images/brutus.jpg" />
             <p>Katie Castaneda!</p>
         </div>
+        <div class="person-frame-inner">
+            <img class="ball" src="images/Cameron_Millar.jpg" />
+            <p>Cameron Millar</p>
+        </div>
         <div class="person-frame-inner">
             <img class="ball" src="images/sujay_godugu.jpg" />
             <p>Sujay Godugu</p>