From 8d80c2fbdcd6efea1a6896f0f4dcfac693cdf772 Mon Sep 17 00:00:00 2001
From: Sophie <soph.boucher@gmail.com>
Date: Fri, 8 Apr 2016 22:02:02 -0400
Subject: [PATCH] Corrected merge errors

---
 Assets/Scripts/Astronaut.cs | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs
index dbd40ca..75db2fc 100644
--- a/Assets/Scripts/Astronaut.cs
+++ b/Assets/Scripts/Astronaut.cs
@@ -71,11 +71,12 @@ public class Astronaut : MonoBehaviour {
         _astronautAnimator = GetComponent<AstronautAnimator>();
         _astronautAnimator.aspi = this;
 		State = AstronautState.Idle;
+
 	    if (!planet)
 	    {
-	        p	    if (!planet)
-	    {e<PlanetManager>();
+	        planet = FindObjectOfType<PlanetManager>();
 	    }
+
 	    State = AstronautState.Idle;
 		//Debug.Log(planet.GetPlanetRadius(0));
 		theta = 0;
@@ -232,11 +233,11 @@ public class Astronaut : MonoBehaviour {
 	public void Dash()
 	{
 	    
-	    iS(Time.time < DashTime + lastDashTime)
+	    if (Time.time < DashTime + lastDashTime)
             return;
         
-        if (_state >= AstronautState.Ejecting)
-		return;
+        if (State >= AstronautState.Ejecting)
+		    return;
 
 	    lastDashTime = Time.time;
         planet.PushWedge(this.theta);
@@ -272,14 +273,5 @@ public class Astronaut : MonoBehaviour {
             State = AstronautState.Walking;
             _astronautAnimator.Walk();
         }
-
-        if (GUI.Button(new Rect(10, 190, 150, 50), "Eject"))
-        {
-           Debug.Lif(State == AstronautState.Walking)
-		{			StartCoroutine("WalkingStance");
-		}
-		{
-			StartCoroutine("WalkingStance");
-		}
-	}*/
+	}
 }