Added jumping to player
Merged Andrei and Nas stuff