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

Conflicts:
	Assets/Scene/scene1_2D.unity
	JClimber-csharp.sln
	JClimber.sln
	JClimber.userprefs
Merge
Commit
Commit de Merge
Merge branch 'master' of https://github.com/lazarohcm/JClimber

Conflicts:
	JClimber-csharp.sln
	JClimber.sln
	JClimber.userprefs
Pulo
Merge branch 'master' of https://github.com/lazarohcm/JClimber

Conflicts:
	Assets/Animations/Player animation/parado.anim
	Assets/Animations/Player animation/player_controller.controller
	Assets/Scene/scene1_2D.unity
	JClimber.userprefs
commit