Merge remote-tracking branch 'origin/jason' into jason

Author: ayushmaang

index.html

@@ -54,8 +54,13 @@ <h2>Rosie the Kraken</h2>
           <img src="rosie-the-kraken.png"/>
         </div>
         <div class="bio-right">
+<<<<<<< HEAD
           <h2>Ayush "the man" Ganotra</h2>
           <p> I'm Ayush, and I'm kinda cool. Ball is life.  </p>
+=======
+          <h2>Ayush Ganotra</h2>
+          <p> I'm Ayush, and I'm kinda cooBall is life.  </p>
+>>>>>>> jason
         </div>
       </div>
         <div class="about">