Final Fix, stupid Merging

My damage balancing and Andres Currency and high scores are both present