FuadBalashov · Jeffterp · Sep 5, 2017 · Sep 5, 2017 · Sep 5, 2017 · Sep 5, 2017
diff --git a/Sara.xml b/Sara.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>Sara Bittner</name>
+  <favoriteCereal>Fruit Loops</favoriteCereal>
+  <funfact>Figure Skater</funfact>
+</participant>
diff --git a/introduce_merge_conflicts.py b/introduce_merge_conflicts.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import os
+
+PARTICIPANTS_DIR = 'participants'
+
+participant_files = os.listdir(PARTICIPANTS_DIR)
+
+for file_name in participant_files:
+    file = open(PARTICIPANTS_DIR + '/' + file_name, 'r')
+    lines = file.readlines()
+    file.close()
+
+    lines_with_spaces = []
+    for line in lines:
+        lines_with_spaces.append('   ' + line)
+
+    file = open(PARTICIPANTS_DIR + '/' + file_name, 'w')
+    file.writelines(lines_with_spaces)
+    file.close()
diff --git a/participants/AndrewN.xml b/participants/AndrewN.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Andrew Natarian</name>
+     <favoriteCereal>Frosted Mini Wheats</favoriteCereal>
+     <funfact>I can juggle...kind of</funfact>
+   </participant>
diff --git a/participants/Geri.xml b/participants/Geri.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Geri Dunellari</name>
+     <favoriteCereal>Honey Wheats</favoriteCereal>
+     <funfact>Favorite Movie Character: Jack Sparrow</funfact>
+   </participant>
diff --git a/participants/Jaydee8866.xml b/participants/Jaydee8866.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Jatin D</name>
+     <favoriteCereal>I dunno</favoriteCereal>
+     <funfact>likes sleeping</funfact>
+   </participant>
diff --git a/participants/Jazmine.xml b/participants/Jazmine.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Jazmine Smith</name>
+     <favoriteCereal>Frosted Flakes</favoriteCereal>
+     <funfact>I love steak</funfact>
+   </participant>
diff --git a/participants/Jeremy.xml b/participants/Jeremy.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Jeremy Klein</name>
+     <favoriteCereal>Cheerios<img src="http://i.imgur.com/RNvRRiz.png" alt ="" style="width:100;height:100;"></favoriteCereal>
+     <funfact>my favorite card game and drink share the same name!</funfact>
+   </participant>
diff --git a/participants/Noah.xml b/participants/Noah.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>John Smith</name>
+     <favoriteCereal>Lucky Charms</favoriteCereal>
+     <funfact>Professional Underwater Basket Weaver</funfact>
+   </participant>
diff --git a/participants/Rohan.xml b/participants/Rohan.xml
@@ -0,0 +1,7 @@
+
+<participant>
+  <name>Rohan Mishra</name>
+  <favoriteCereal>Cocoa Puffs</favoriteCereal>
+  <funFact>VZero artistic talent</funFact>
+</participant>
+
diff --git a/participants/Samrat.xml b/participants/Samrat.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Samrat</name>
+     <favoriteCereal>Honey Nut Cheerios</favoriteCereal>
+     <funfact>CEO</funfact>
+   </participant>
diff --git a/participants/Stephen.xml b/participants/Stephen.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Stephen Dusseau</name>
+     <favoriteCereal>Cheerios</favoriteCereal>
+     <funfact>I'm bad at CS</funfact>
+   </participant>
diff --git a/participants/Vladinfo.xml b/participants/Vladinfo.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Vlad and Mark </name>
+     <favoriteCereal>Cherrios </favoriteCereal>
+     <funfact> can type </funfact>
+   </participant>
diff --git a/participants/akshaya.xml b/participants/akshaya.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Akshaya Anand</name>
+     <favoriteCereal>Corn Flakes</favoriteCereal>
+     <funfact>I enjoy origami</funfact>
+   </participant>
diff --git a/participants/bethanyriley.xml b/participants/bethanyriley.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>Bethany Riley</name>
+  <favoriteCereal>Cheerios</favoriteCereal>
+  <funFact>I like to run</funFact>
+</participant>
diff --git a/participants/daniel.xml b/participants/daniel.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Daniel Beall</name>
+     <favoriteCereal>I don't like cereal</favoriteCereal>
+     <funfact>I play drums</funfact>
+   </participant>
diff --git a/participants/file_liya.xml b/participants/file_liya.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Liya Ketema</name>
+     <favoriteCereal>Corn Flakes</favoriteCereal>
+     <funfact>In b/n bilingual-trilingual</funfact>
+   </participant>
diff --git a/participants/henry.xml b/participants/henry.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Henry</name>
+     <favoriteCereal>Fruit Loops</favoriteCereal>
+     <funfact>Used to be part of UMD's boxing team</funfact>
+   </participant>
diff --git a/participants/jason_ramsey.xml b/participants/jason_ramsey.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Jason Ramsey</name>
+     <favoriteCereal>Raisin Bran</favoriteCereal>
+     <funfact>Grumpy ol' Fart</funfact>
+   </participant>
diff --git a/participants/jeff.txt b/participants/jeff.txt
@@ -0,0 +1,5 @@
+<participant>
+  <name>Jeff </name>
+  <favoriteCereal>Life</favoriteCereal>
+  <funfact>studies astrology in spare time</funfact>
+</participant>
diff --git a/participants/jeff.xml b/participants/jeff.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>Jeff </name>
+  <favoriteCereal>Life</favoriteCereal>
+  <funFact>studies astrology in spare time</funFact>
+</participant>
diff --git a/participants/john.xml b/participants/john.xml
@@ -1,5 +1,5 @@
-<participant>
-  <name>John</name>
-  <favoriteCereal>Lucky Charms</favoriteCereal>
-  <funfact>Professional Basket Weaver</funfact>
-</participant>
+   <participant>
+     <name>John</name>
+     <favoriteCereal>Lucky Charms</favoriteCereal>
+     <funfact>Professional Basket Weaver</funfact>
+   </participant>
diff --git a/participants/justinsinger.xml b/participants/justinsinger.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>Justin Singer</name>
+  <favoriteCereal>Apple Jacks</favoriteCereal>
+  <funFact>I'm the only person who likes apple jacks :(</funFact>
+</participant>
diff --git a/participants/participantTemplate.xml b/participants/participantTemplate.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>John Smith</name>
+  <favoriteCereal>Lucky Charms</favoriteCereal>
+  <funfact>Professional Underwater Basket Weaver</funfact>
+</participant>
diff --git a/participants/philip-gouldman.xml b/participants/philip-gouldman.xml
@@ -0,0 +1,5 @@
+   <participant>
+     <name>Philip Gouldman</name>
+     <favoriteCereal>Honey Nut Cheerios</favoriteCereal>
+     <funfact>Currently a rhythm guitarist in a melodic death metal band</funfact>
+   </participant>
diff --git a/participants/titus.xml b/participants/titus.xml
@@ -0,0 +1,5 @@
+<participant>
+  <name>Titus Rasmussen</name>
+  <favoriteCereal>Cinnamon Toast Crunch</favoriteCereal>
+  <funFact>Have a GED</funFact>
+</participant>