add player name events
rearrange test
Merge branch 'master' into solution