Jumping is done!
Merge branch 'master' of https://github.com/WerewolfPuppy/CC2

Conflicts:
	CC2/Unity Project/Unity Project-csharp.v11.suo