Added the player class that was modified in the player branch