Outro Merge
Merge branch 'master' of https://github.com/lazarohcm/JClimber

Conflicts:
	Assets/Scene/scene1_2D.unity
	JClimber-csharp.sln
	JClimber.sln