Added window to Makefile
Added window field to Cell class
Modified score function
Added graphic display to Grid class
Fixed merge conflict in grid