testes
Merge branch 'master' of https://github.com/lazarohcm/JC
fixing assembly
Merge branch 'master' of https://github.com/lazarohcm/JC

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Game Boy - Tetris - Mario Luigi.png.meta
	JC.userprefs
ahahahah
Merge branch 'master' of https://github.com/lazarohcm/JC

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Animations/Player animation.meta
	Assets/Animations/playerWalking.meta
	Assets/Resources/Prefabs/Novo Documento RTF.rtf
	Assets/Resources/Prefabs/Novo Documento RTF.rtf.meta
	Assets/Resources/personagem.png.meta
	Assets/Scene/cena1.unity
	Assets/Scripts/PlayerMoviment.cs
	Assets/Scripts/PlayerMoviment.cs.meta
	Assets/Scripts/scripts.meta
	Assets/Sprites/Photo Sep 26, 22_57_35.png.meta
	Assets/Sprites/Photo Sep 26, 23_11_08.png.meta
	Assets/Sprites/Photo Sep 26, 23_11_12.png.meta
	JC-csharp.sln
	JC.sln
	JC.userprefs
	ProjectSettings/TagManager.asset