Made a Player class
Merge