+Player, players
+some methods
Merge remote-tracking branch 'origin/master'