hi its kayla
 I worked on Dialogue Box
Merge branch 'master' of https://github.com/corychang/Patient
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