possible project change with new Player class
Merge remote-tracking branch 'origin/master'