diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@idle.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@idle.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@jump.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@jump.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@laying_nodding.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@laying_nodding.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@silly_dancing.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@silly_dancing.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@talking.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@talking.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@talking_1.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@talking_1.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@twist_dance.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@twist_dance.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/Stefani@walking.fbx.meta b/FinalPrjct/Assets/Models/Stefani/Stefani@walking.fbx.meta
diff --git a/FinalPrjct/Assets/Models/Stefani/StefaniController.controller b/FinalPrjct/Assets/Models/Stefani/StefaniController.controller
diff --git a/FinalPrjct/Assets/Models/Stefani/StefaniController.controller.meta b/FinalPrjct/Assets/Models/Stefani/StefaniController.controller.meta
diff --git a/FinalPrjct/Assets/StopRemy.cs b/FinalPrjct/Assets/StopRemy.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+using System.Collections;
+
+public class StopRemy : MonoBehaviour {
+
+	Animator anim;
+	public iTweenEvent spvar;
+
+	// Use this for initialization
+	void Start () {
+		anim = GetComponent<Animator> ();
+		spvar = GetComponent<iTweenEvent> ();
+
+	}
+
+	void OnTriggerEnter (Collider col){
+		spvar.enabled = false;
+		anim.SetTrigger ("isDancing");
+
+	}
+	// Update is called once per frame
+	void Update () {
+	}
+}
diff --git a/FinalPrjct/Assets/Wander.cs.meta → FinalPrjct/Assets/StopRemy.cs.meta b/FinalPrjct/Assets/Wander.cs.meta → FinalPrjct/Assets/StopRemy.cs.meta
diff --git a/FinalPrjct/Assets/TalkRemy.cs b/FinalPrjct/Assets/TalkRemy.cs
@@ -0,0 +1,40 @@
+using UnityEngine;
+using System.Collections;
+
+public class TalkRemy : MonoBehaviour {
+
+	Animator anim;
+	public iTweenEvent scvar;
+
+	// Use this for initialization
+	void Start(){
+		anim = GetComponent<Animator> ();
+		scvar = GetComponent<iTweenEvent> ();
+		StartCoroutine ("text1");
+	}
+
+	IEnumerator text1(){
+		yield return new WaitForSeconds (5.0f);
+		GameObject txtbx = GameObject.FindGameObjectWithTag ("text1");
+		GameObject cam = GameObject.FindGameObjectWithTag ("MainCamera");
+		txtbx.transform.position = cam.transform.position + new Vector3 (9.61f, -4.0f, -9.14f);
+
+
+		anim.SetTrigger ("isTalking");
+
+		Destroy (txtbx, 7.0f);
+		StartCoroutine ("move1");
+	}
+
+	IEnumerator move1(){
+		yield return new WaitForSeconds (8.0f);
+
+		anim.SetTrigger ("isWalking");
+		scvar.enabled = true;
+
+	}
+	// Update is called once per frame
+	void Update () {
+
+	}
+}
diff --git a/FinalPrjct/Assets/TalkRemy.cs.meta b/FinalPrjct/Assets/TalkRemy.cs.meta
diff --git a/FinalPrjct/Assets/Wander.cs b/FinalPrjct/Assets/Wander.cs
diff --git a/FinalPrjct/FinalPrjct.userprefs b/FinalPrjct/FinalPrjct.userprefs
@@ -1,15 +1,10 @@
 <Properties StartupItem="Assembly-CSharp.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
-<<<<<<< HEAD
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\iTweenEditor\iTweenEvent.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\StopRemy.cs">
     <Files>
-      <File FileName="Assets\iTweenEditor\iTweenEvent.cs" Line="78" Column="66" />
-      <File FileName="Assets\iTweenEditor\Editor\iTweenEventDataEditor.cs" Line="1" Column="1" />
-=======
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Wander.cs">
-    <Files>
-      <File FileName="Assets\Wander.cs" Line="60" Column="3" />
->>>>>>> origin/prtk
+      <File FileName="Assets\TalkRemy.cs" Line="34" Column="3" />
+      <File FileName="Assets\StopRemy.cs" Line="19" Column="3" />
+      <File FileName="Assets\iTweenEditor\iTweenEvent.cs" Line="32" Column="42" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/FinalPrjct/Library/CurrentLayout.dwlt b/FinalPrjct/Library/CurrentLayout.dwlt
diff --git a/FinalPrjct/Library/CurrentMaximizeLayout.dwlt b/FinalPrjct/Library/CurrentMaximizeLayout.dwlt
diff --git a/FinalPrjct/Library/InspectorExpandedItems.asset b/FinalPrjct/Library/InspectorExpandedItems.asset
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp.dll b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/FinalPrjct/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/FinalPrjct/Library/assetDatabase3 b/FinalPrjct/Library/assetDatabase3
diff --git a/FinalPrjct/Library/expandedItems b/FinalPrjct/Library/expandedItems
diff --git a/FinalPrjct/Library/metadata/00/00000000000000003000000000000000 b/FinalPrjct/Library/metadata/00/00000000000000003000000000000000
diff --git a/FinalPrjct/Library/metadata/00/00000000000000004000000000000000 b/FinalPrjct/Library/metadata/00/00000000000000004000000000000000
diff --git a/FinalPrjct/Library/metadata/00/00000000000000006100000000000000 b/FinalPrjct/Library/metadata/00/00000000000000006100000000000000
diff --git a/FinalPrjct/Library/metadata/3c/3cab08ec68e24184994f9f289801fc7c b/FinalPrjct/Library/metadata/3c/3cab08ec68e24184994f9f289801fc7c
diff --git a/.../9f/9f5f2a6c2fed06a4b8b17a9d2bb33482.info → .../3c/3cab08ec68e24184994f9f289801fc7c.info b/.../9f/9f5f2a6c2fed06a4b8b17a9d2bb33482.info → .../3c/3cab08ec68e24184994f9f289801fc7c.info
diff --git a/FinalPrjct/Library/metadata/40/401eec00bb1d0a24dbd5e3684c0fb4a8 b/FinalPrjct/Library/metadata/40/401eec00bb1d0a24dbd5e3684c0fb4a8
diff --git a/FinalPrjct/Library/metadata/40/401eec00bb1d0a24dbd5e3684c0fb4a8.info b/FinalPrjct/Library/metadata/40/401eec00bb1d0a24dbd5e3684c0fb4a8.info
diff --git a/FinalPrjct/Library/metadata/4b/4bba7f8801584414f9eb335b976f130c b/FinalPrjct/Library/metadata/4b/4bba7f8801584414f9eb335b976f130c
diff --git a/FinalPrjct/Library/metadata/50/50464cf275ec0174abfddc6ba472f867 b/FinalPrjct/Library/metadata/50/50464cf275ec0174abfddc6ba472f867
diff --git a/FinalPrjct/Library/metadata/59/59dee94397d38524294263ad0f07665f b/FinalPrjct/Library/metadata/59/59dee94397d38524294263ad0f07665f
diff --git a/FinalPrjct/Library/metadata/76/76811ce44f4221447929df51ea90c590 b/FinalPrjct/Library/metadata/76/76811ce44f4221447929df51ea90c590
diff --git a/FinalPrjct/Library/metadata/7a/7a1a64c93a89ab047b89f1fcd7147622 b/FinalPrjct/Library/metadata/7a/7a1a64c93a89ab047b89f1fcd7147622
diff --git a/FinalPrjct/Library/metadata/7a/7a1a64c93a89ab047b89f1fcd7147622.info b/FinalPrjct/Library/metadata/7a/7a1a64c93a89ab047b89f1fcd7147622.info
diff --git a/FinalPrjct/Library/metadata/8c/8ccd4d2fe54d9914cb3c6528e89175d5 b/FinalPrjct/Library/metadata/8c/8ccd4d2fe54d9914cb3c6528e89175d5
diff --git a/FinalPrjct/Library/metadata/9b/9b252286881293541bba0e564515c2cf b/FinalPrjct/Library/metadata/9b/9b252286881293541bba0e564515c2cf
diff --git a/FinalPrjct/Library/metadata/c1/c1682174c2680ae47af7fdacb729a7bb b/FinalPrjct/Library/metadata/c1/c1682174c2680ae47af7fdacb729a7bb
diff --git a/...adata/9f/9f5f2a6c2fed06a4b8b17a9d2bb33482 → ...adata/cf/cf8b4b6f8cb24bd47b1ac640517ee860 b/...adata/9f/9f5f2a6c2fed06a4b8b17a9d2bb33482 → ...adata/cf/cf8b4b6f8cb24bd47b1ac640517ee860
diff --git a/FinalPrjct/Library/metadata/cf/cf8b4b6f8cb24bd47b1ac640517ee860.info b/FinalPrjct/Library/metadata/cf/cf8b4b6f8cb24bd47b1ac640517ee860.info
diff --git a/FinalPrjct/Library/metadata/f0/f0bca3ac341beb34fb153d0a85fa6280 b/FinalPrjct/Library/metadata/f0/f0bca3ac341beb34fb153d0a85fa6280
diff --git a/FinalPrjct/Library/shadercompiler-UnityShaderCompiler.exe0.log b/FinalPrjct/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,6 +1,2 @@
 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: getPlatforms
-Cmd: compileSnippet
-  api=4 type=0 insize=927 outsize=2353 kw=POINT SHADOWS_OFF _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=927 outsize=3501 kw=POINT SHADOWS_OFF _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING ok=1
diff --git a/FinalPrjct/ProjectSettings/TagManager.asset b/FinalPrjct/ProjectSettings/TagManager.asset
diff --git a/FinalPrjct/obj/Debug/Assembly-CSharp-firstpass.dll b/FinalPrjct/obj/Debug/Assembly-CSharp-firstpass.dll
diff --git a/FinalPrjct/obj/Debug/Assembly-CSharp-firstpass.pdb b/FinalPrjct/obj/Debug/Assembly-CSharp-firstpass.pdb
diff --git a/FinalPrjct/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache b/FinalPrjct/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache
diff --git a/FinalPrjct/obj/Debug/Assembly-CSharp.dll b/FinalPrjct/obj/Debug/Assembly-CSharp.dll
diff --git a/FinalPrjct/obj/Debug/Assembly-CSharp.pdb b/FinalPrjct/obj/Debug/Assembly-CSharp.pdb