working player class
Player class working

Merge branch 'working-on-player'