diff --git a/NumberGuessGame/Program.cs b/NumberGuessGame/Program.cs
index b48870d..801e3f8 100644
--- a/NumberGuessGame/Program.cs
+++ b/NumberGuessGame/Program.cs
@@ -8,7 +8,11 @@ public static void Main(string[] args)
         {
             //I want to remember the username, so we create a var to hold it
             String player_name;
+<<<<<<< HEAD
+            Console.WriteLine("Welcome to the World Famous Guessing Game!");
+
             Console.WriteLine("Welcome to the World Famous Guessing game!");
+
             Console.WriteLine("What is your name contestent?");
             player_name = Console.ReadLine();
             Console.WriteLine("Lets roll the dice behind the screen, and see what number we get!");
@@ -48,7 +52,7 @@ public static void Main(string[] args)
             }
 
             System.Threading.Thread.Sleep(2000);
-            int secret = (int)(r.NextDouble() * 100.0);
+            int secret = (int)(r.NextDouble() * 90.0);
 
             Console.WriteLine("Great!  We have our number!  Now guess out of 100!");
 
@@ -66,7 +70,7 @@ public static void Main(string[] args)
                 }
 
                 //Okay, we have a valid int, but we need to make sure it's in range
-                if (iGuess >= 100 || iGuess < 0){
+                if (iGuess >= 90 || iGuess < 0){
 					Console.WriteLine("That's not how this works!  That's not how any of this works!  Guess again!");
 					continue;
                 }