changed player baseScale to account for new square_round.png resource
merge conflict