Fixed main and added scoring functions to grid
Fixed merge conflicts in grid.cc and main.cc