failing test for testDimensions in GridTest
failing test for testSearchedColor written
merge conflicts fixed