merging various commits and stashes
Created PlayerManager