fixed jump animation and shoot
fixed size
Adding the bullet
corrected merge