Fixed jumping in water

Fixed an issue where the player couldn't jump out of water onto a block
level with the water.
Removed Extra Code

Since the particle code is no longer on this branch, it's been removed.
Merged Particle-Implementation into master

Merged and fixed conflicts. Closes #7.
Removed redundant code

Removed left over code that accidentally made it through the merge.
Merge remote-tracking branch 'origin/master' into particle-implementation