player class
Merge branch 'player-class'