Modified Player class
Merge branch 'development' into board