giro, flecha, pulo
Merge branch 'master' of https://github.com/lazarohcm/JC

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scene/cena1.unity
	JC-csharp.sln
	JC.sln
	JC.userprefs