modified: Assets/Art/Kiwi/Kiwi.controller

	modified:   Assets/Scripts/Birb/Jump.cs
	modified:   Assets/Scripts/Util/Hazard.cs
	modified:   Assets/Scripts/Util/HazardSlow.cs

Assets/Scripts/Birb/Jump.cs

@@ -11,6 +11,7 @@ public class Jump : AbstractBehavior {
 	public float wallJumpHorizontalSpeed = 5;
 
 	bool jumpRequested;
+	bool jumpBlocked;
 	int airJumpsMade = 0;
 
 	Walk walk;
@@ -46,6 +47,7 @@ public class Jump : AbstractBehavior {
 	public void Activate() {
 		if (collisionState.onGround) {
 			// ground jump
+
 			airJumpsMade = 0;
 			Vector2 vel = body.velocity;
 			vel.y = GetJumpVelocity(jumpHeight);

Assets/Scripts/Util/Hazard.cs

@@ -8,11 +8,10 @@ public class Hazard : MonoBehaviour {
 	{
 		if (other.CompareTag("Player"))
 		{
-<<<<<<< HEAD
+
 			other.GetComponent<Birb>().Die ();
-=======
             other.gameObject.SendMessage("Die", SendMessageOptions.DontRequireReceiver);
->>>>>>> 39c5a01ae3b7aa60f1687d601bceca7f4a87e3dc
+
 		}
 	}
 }

Assets/Scripts/Util/HazardSlow.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class HazardSlow : AbstractBehavior {
-
+	//Remember to give prefabs that have this script a "slowHazard" tag.
 	float slowfactor;
 	public float slowedSpeed;