minor fixes. string comp.
fixed order factory. added player parameter
moved functionality from grid to game manager. Implemented points for x and y instead.
fixed merge