Cleaned up
Now passes all of our tests, as well as prof's, also, calcIndex(x,y) is now calcIndex(row,col)