Finished merging the two versions of jumping/shooting together.