Merge branch 'gh-pages' of github.com:ALFA-group/alfa-group.github.io into gh-pages

Author: stevenjson

_data/people/collaborators.yml

@@ -38,12 +38,15 @@
   scholar_link: https://scholar.google.com/citations?user=hZl5anoAAAAJ&hl=en
   info:
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 - name: Joseph Bates
   photo: 
   role: Research Collaborator
   location: Singular Computing LLC
 =======
+=======
+>>>>>>> 61809aa9b5425ff00e0b99817b135eec1e6f0c2a
 - name: Dr. Yair Allouche
   photo: 
   role: Research Collaborator
@@ -57,12 +60,19 @@
   photo: 
   role: Research Collaborator
   location: IBM Research
+<<<<<<< HEAD
+>>>>>>> 61809aa9b5425ff00e0b99817b135eec1e6f0c2a
+=======
 >>>>>>> 61809aa9b5425ff00e0b99817b135eec1e6f0c2a
   email: 
   scholar_link: 
   info:
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> 61809aa9b5425ff00e0b99817b135eec1e6f0c2a
 =======
 
 >>>>>>> 61809aa9b5425ff00e0b99817b135eec1e6f0c2a