cleaned up so pointless code

changed jump height so you can jump over enemy.
moved enemy collision detection back into its own function again.