Random stuff added to this game engine which I do not know how to use Meena is also confused as well what is going on she is staring at me creepily
First test commit
hi its kayla
 I worked on Dialogue Box
Merge branch 'master' of https://github.com/corychang/Patient
Merge pull request #33 from boyP/master

Added MouseLook.js
Merge branch 'master' of https://github.com/corychang/Patient

Conflicts:
	Patient/Assets/New Terrain.asset
	Patient/Assets/New Terrain.asset.meta
	Patient/Assets/Scenes/TempScene.unity
	Patient/Assets/Standard Assets.meta
	Patient/Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	Patient/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	Patient/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png.meta
	Patient/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png.meta
	Patient/Assets/Standard Assets/Character Controllers/Sources/Scripts/MouseLook.cs
	Patient/Assets/Standard Assets/Character Controllers/Sources/Scripts/ThirdPersonCamera.js
Dialogue with changes
Merge pull request #30 from dighjd12/master

Dialogue
Merge branch 'master' of https://github.com/corychang/Patient

Conflicts:
	Patient/Assets/New Terrain.asset
	Patient/Assets/New Terrain.asset.meta
	Patient/Assets/Standard Assets.meta
	Patient/Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	Patient/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	Patient/ProjectSettings/Physics2DSettings.asset
game state manager architecture
Merge pull request #36 from corychang/gamestate

game state manager architecture
Merge pull request #35 from chenannigans/master

Head Nod Detection
Just trying to merge?
Test game state manager
remove non-compiling file
Merge pull request #40 from corychang/testgamestate

Testgamestate
Actually adding files for nod and shake triggers
Merge pull request #39 from mojoz0/master

Basic sample scene and Nod and Shake Triggers
Moved nodTrigger and shakeTrigger to /Scripts