A Black Olive and Tomato Salad with Toasted Naan