jump fix attempt
Merge branch 'master' of github.com:risdevs/GridGame

Conflicts:
	Assets/Demo/Non-Physics-Based/NonPhysicsPlayerTester.cs