played around with unity
hi its kayla
adds a quick contributing guide to the README
Merge pull request #11 from AEgan/master

adds a quick contributing guide to the README
replaces 1 with bullets
Merge branch 'master' of https://github.com/corychang/Patient
because I'm bad
Merge pull request #24 from AEgan/master

Replaces 1s with bullet points
 I worked on Dialogue Box
Merge branch 'master' of https://github.com/corychang/Patient
add initial game state skeleton code
Created a Script folder and moved all existing .cs and .cs.meta files from Assets to Assets/Scripts
Updated MouseLook.js
Merge remote-tracking branch 'upstream/master'
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