Adjusted gravity and jump mechanics
Minor change to test merging
Merge branch 'james'