Added collision detection in the x direction

I misnamed the branch :P But I shrunk the player collision rect to 20x20 and added collision in the x direction.

Also added jumping changes to make them not reset the player. The speed and height at which the player jumps can be changed by changing the MOVERATE and JUMPING_DURATION variables.