removed unneeded class
getters and setters for player
Merge branch 'origin/master'