PlayerInfo added to Player
Merge branch 'master' of https://github.com/maljian/beetle.git