não sei o que mudou!
Merge remote-tracking branch 'origin/master'

Conflicts:
	trabalho1/Assembly-UnityScript-firstpass.pidb
	trabalho1/Assembly-UnityScript.pidb
	trabalho1/Assets/Standard Assets/Character Controllers/Sources/Scripts/ThirdPersonController.js
	trabalho1/Assets/cena2.unity
	trabalho1/Assets/pathHandler.js
	trabalho1/Library/InspectorExpandedItems.asset
	trabalho1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	trabalho1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	trabalho1/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	trabalho1/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	trabalho1/Library/ScriptAssemblies/Assembly-UnityScript.dll
	trabalho1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	trabalho1/Library/assetDatabase3
	trabalho1/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	trabalho1/Library/metadata/ff/ff694bcd837def140935d6e072f74892
	trabalho1/trabalho1-csharp.sln
	trabalho1/trabalho1.sln
	trabalho1/trabalho1.userprefs