merge conflict resolution
changed game manager. made grids in a map to player name. orders as well. formatted
commit for merge
fixed merge