Added collision detection in the x direction
Changed jumping to be consistent with where the player is
Added some comments on jumping
Added jumping collision detection
Fixed crashing
Merge pull request #10 from markbahnman/y-direction-collision-detection

Added collision detection in the x direction