Salad with artichoke and olives