ReutRosenwasser · ReutRosenwasser · Oct 17, 2019 · Oct 18, 2019 · Oct 18, 2019 · Oct 18, 2019
diff --git a/Amanda_Randonis/Amanda_Randonis.jpg b/Amanda_Randonis/Amanda_Randonis.jpg
diff --git a/Amanda_Randonis/origin.org b/Amanda_Randonis/origin.org
diff --git a/Students/Reut_Rosenwasser/Reut_Rosenwasser.jpg b/Students/Reut_Rosenwasser/Reut_Rosenwasser.jpg
diff --git a/Students/Reut_Rosenwasser/origin.org b/Students/Reut_Rosenwasser/origin.org
@@ -0,0 +1,3 @@
+Hello my name is Reut Rosenwasser
+I am originally from Israel
+Now I live in Queens
diff --git a/conflictDemo/src/README.org b/conflictDemo/src/README.org
@@ -2,6 +2,8 @@
 
 We are going to show you how to resolve a git conflict in two files.
 
+Here is a better change. Arrgh!!!
+
+
 
-Here is our line that we can change to cause a conflict
 
diff --git a/conflictDemo/src/program2.py b/conflictDemo/src/program2.py
@@ -14,7 +14,9 @@
     print(" You have 7 guesses to guess it")
     guessNum = 0
     mySecretNum=rd.randint(1,64)
-    print("my secret number is {secret}.".format(secret=mySecretNum))
+    qString="my secret number is {secret}.".format(secret=mySecretNum)
+    print(qString)
+
     rawGuess = int(input('What is your guess?'))
 
     if (rawGuess>=1 and rawGuess<=64):

diff --git a/images/Reut_Rosenwasser.jpg b/images/Reut_Rosenwasser.jpg
diff --git a/students/Abubakar_Shafee/Abubakar_Shafee.JPG b/students/Abubakar_Shafee/Abubakar_Shafee.JPG
diff --git a/students/Abubakar_Shafee/origin.org b/students/Abubakar_Shafee/origin.org
@@ -0,0 +1,2 @@
+Hello There,
+My name is Abubakar Shafee(23133369). I came from Bangladesh in 2011. In 2012, I started my first college in laguardia Community college. My Major was the Computer Technology. I finished my Associate Degree there. Then I transfered to John Jay College of Criminal Justice in Computer Science and Information Security Major. My Goal is to become a Cyber security Head. My long time goal is to finish my PHD Degree in Computer Science from The Graduate Center. 
diff --git a/students/Alex_Trujillo/alex_trujillo.jpg b/students/Alex_Trujillo/alex_trujillo.jpg
diff --git a/students/Alex_Trujillo/origin.org b/students/Alex_Trujillo/origin.org
@@ -0,0 +1 @@
+My name is ALex and I was born in the Bronx
diff --git a/students/Arman_Khan/Arman_Khan.JPG b/students/Arman_Khan/Arman_Khan.JPG
diff --git a/students/Arman_Khan/Arman_Khan.org b/students/Arman_Khan/Arman_Khan.org
@@ -0,0 +1 @@
+Hello. My name is Arman Khan. I was born in Bangladesh and came to New York City when I was two months old. I have lived and grew up in Astoria,Queens since. 
diff --git a/students/Fabian_Vilela/Fabian_Vilela.png b/students/Fabian_Vilela/Fabian_Vilela.png
diff --git a/students/Fabian_Vilela/origin.org b/students/Fabian_Vilela/origin.org
@@ -0,0 +1 @@
+I was born in Manhattan,but I grew up in Woodhaven. 
diff --git a/students/Maisha_Khan/Maisha.Khan.org b/students/Maisha_Khan/Maisha.Khan.org
@@ -0,0 +1 @@
+My name is Maisha Khan. I was in Elmhurst, but I grew up in Astoria Queens.
diff --git a/students/Maisha_Khan/Maisha_Khan.JPG b/students/Maisha_Khan/Maisha_Khan.JPG
diff --git a/students/Priya_Thapa/Priya_Thapa.jpg b/students/Priya_Thapa/Priya_Thapa.jpg
diff --git a/students/Priya_Thapa/origin.org b/students/Priya_Thapa/origin.org
@@ -0,0 +1,4 @@
+
+
+
+I am from Queens and my Zip Code is 11373. 
diff --git a/students/Rabe_Datta/Rabe_Datta.jpg b/students/Rabe_Datta/Rabe_Datta.jpg
diff --git a/students/Rabe_Datta/origin.org b/students/Rabe_Datta/origin.org
@@ -0,0 +1 @@
+Hello, my name is Rabe. I was born in Bangladesh, but I grew up in Brooklyn, New York. My zip code is 11208. 
diff --git a/students/Reut_Rosenwasser b/students/Reut_Rosenwasser
@@ -0,0 +1,3 @@
+HELLO MY NAME IS REUT ROSENWASSER
+I AM FROM QUEENS 
+ORIGINALLY I AM FROM ISRAEL 
diff --git a/students/Steven_Perez/Steven_Perez.jpg b/students/Steven_Perez/Steven_Perez.jpg
diff --git a/students/Steven_Perez/origin.org b/students/Steven_Perez/origin.org
@@ -0,0 +1,2 @@
+Hi my name is Steven Perez.
+Born and raised in washington heights, now currently living in the Bronx.
diff --git a/students/Tasnia_Tabassum/Tasnia_Tabassum.jpg b/students/Tasnia_Tabassum/Tasnia_Tabassum.jpg
diff --git a/students/Tasnia_Tabassum/origin.org b/students/Tasnia_Tabassum/origin.org
@@ -0,0 +1 @@
+My name is Tasnia Tabassum and I was born and raised in Queens, NY.
diff --git a/students/Victor_Bi/Victor_Bi.jpg b/students/Victor_Bi/Victor_Bi.jpg
diff --git a/students/Victor_Bi/origin.org b/students/Victor_Bi/origin.org
@@ -0,0 +1 @@
+Fresh Meadows, 11366
diff --git a/students/anthony_zamora/anthony_zamora.png b/students/anthony_zamora/anthony_zamora.png
diff --git a/students/anthony_zamora/origin.org b/students/anthony_zamora/origin.org
@@ -0,0 +1 @@
+I was born and raised in the Upper East Side
diff --git a/students/bimal_roka/bimal_roka.jpg b/students/bimal_roka/bimal_roka.jpg
diff --git a/students/bimal_roka/origin.org b/students/bimal_roka/origin.org
@@ -0,0 +1 @@
+I am from Queens and my zip code is 11377.
diff --git a/students/chong_yu/chong_yu.jpg b/students/chong_yu/chong_yu.jpg
diff --git a/students/chong_yu/origin.org b/students/chong_yu/origin.org
@@ -0,0 +1 @@
+I was born in Seoul, South Korea. I moved to the US (Seattle,Washington) in 6th grade and in 8th grade I moved to Tacoma,Washington and then finally moved to NYC in 2015 to further my education! I live in Astoria, and the zipcode is 11101!
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,8 @@

		We are going to show you how to resolve a git conflict in two files.

		Here is a better change. Arrgh!!!



		Here is our line that we can change to cause a conflict
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hello There,
		My name is Abubakar Shafee(23133369). I came from Bangladesh in 2011. In 2012, I started my first college in laguardia Community college. My Major was the Computer Technology. I finished my Associate Degree there. Then I transfered to John Jay College of Criminal Justice in Computer Science and Information Security Major. My Goal is to become a Cyber security Head. My long time goal is to finish my PHD Degree in Computer Science from The Graduate Center.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Hello. My name is Arman Khan. I was born in Bangladesh and came to New York City when I was two months old. I have lived and grew up in Astoria,Queens since.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		I was born in Manhattan,but I grew up in Woodhaven.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		My name is Maisha Khan. I was in Elmhurst, but I grew up in Astoria Queens.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Hello, my name is Rabe. I was born in Bangladesh, but I grew up in Brooklyn, New York. My zip code is 11208.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hi my name is Steven Perez.
		Born and raised in washington heights, now currently living in the Bronx.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		My name is Tasnia Tabassum and I was born and raised in Queens, NY.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		I was born in Seoul, South Korea. I moved to the US (Seattle,Washington) in 6th grade and in 8th grade I moved to Tacoma,Washington and then finally moved to NYC in 2015 to further my education! I live in Astoria, and the zipcode is 11101!