First
merge
teste
movimento personagem
Adicionando Sprites
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
commit
Merge branch 'master' of https://github.com/lazarohcm/JClimber

Conflicts:
	.gitignore
	Assets/Animations.meta
	Assets/PlayerWeapons.cs.meta
	Assets/Prefabs.meta
	Assets/Scene.meta
	Assets/Scene/scene1_2D.unity
	Assets/Scripts.meta
	Assets/Sprites.meta
	JClimber-csharp.sln
	JClimber.sln
	JClimber.userprefs
Commit